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.
8161915: Linking gtestLauncher may end up linking with non-gtest libjvm
authormgerdin
Thu, 21 Jul 2016 14:06:22 +0200
changeset 39991 d89a486fa0d2
parent 39990 75246d451c39
child 39992 358e93ea57df
child 39993 82256382f7a1
8161915: Linking gtestLauncher may end up linking with non-gtest libjvm Reviewed-by: dholmes, ehelin
hotspot/make/lib/CompileGtest.gmk file | annotate | diff | comparison | revisions 
--- a/hotspot/make/lib/CompileGtest.gmk	Wed Jul 20 14:47:53 2016 +0300
+++ b/hotspot/make/lib/CompileGtest.gmk	Thu Jul 21 14:06:22 2016 +0200
@@ -104,7 +104,7 @@
         -I$(GTEST_FRAMEWORK_SRC)/include, \
     CFLAGS_DEBUG_SYMBOLS := $(JVM_CFLAGS_SYMBOLS), \
     CXXFLAGS_DEBUG_SYMBOLS := $(JVM_CFLAGS_SYMBOLS), \
-    LDFLAGS := $(LDFLAGS_TESTEXE), \
+    LDFLAGS := $(LDFLAGS_JDKEXE), \
     LDFLAGS_unix := -L$(JVM_OUTPUTDIR)/gtest $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_solaris := -library=stlport4, \
     LIBS_unix := -ljvm, \
jdk-sandbox