Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8169255: Link gtestLauncher statically if libjvm is configured for static linking
authorerikj
Mon, 07 Nov 2016 10:12:14 +0100
changeset 42542 e8d67bf2f2de
parent 42088 71d7ced6c439
child 42543 9e7ac7aff2d1
8169255: Link gtestLauncher statically if libjvm is configured for static linking Reviewed-by: tbell, dholmes
hotspot/make/lib/CompileGtest.gmk file | annotate | diff | comparison | revisions 
--- a/hotspot/make/lib/CompileGtest.gmk	Thu Nov 03 10:44:17 2016 -0400
+++ b/hotspot/make/lib/CompileGtest.gmk	Mon Nov 07 10:12:14 2016 +0100
@@ -107,6 +107,7 @@
     LDFLAGS := $(LDFLAGS_JDKEXE), \
     LDFLAGS_unix := -L$(JVM_OUTPUTDIR)/gtest $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_solaris := -library=stlport4, \
+    LIBS_linux := $(LIBCXX), \
     LIBS_unix := -ljvm, \
     LIBS_windows := $(JVM_OUTPUTDIR)/gtest/objs/jvm.lib, \
     COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \
jdk-sandbox