# HG changeset patch # User mgerdin # Date 1469102782 -7200 # Node ID d89a486fa0d28f172cf9445f2775586e0ffdc288 # Parent 75246d451c391cdd564cc0a42e026b620c5c15f5 8161915: Linking gtestLauncher may end up linking with non-gtest libjvm Reviewed-by: dholmes, ehelin diff -r 75246d451c39 -r d89a486fa0d2 hotspot/make/lib/CompileGtest.gmk --- 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, \