changeset 12276:2030aa3bcc00

8169255: Link gtestLauncher statically if libjvm is configured for static linking Reviewed-by: tbell, dholmes
author erikj
date Mon, 07 Nov 2016 10:12:14 +0100
parents 246f6fb74bf1
children 31fba7f1a530
files make/lib/CompileGtest.gmk
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/lib/CompileGtest.gmk	Thu Nov 03 10:44:17 2016 -0400
+++ b/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), \