Merge

2015-12-15 19:01:07 -08:00 · 2015-12-15 19:01:07 -08:00 · 18175d1f1d
commit 18175d1f1d
parent c0dba352fa c02d7b3ef5
1 changed files with 1 additions and 1 deletions
--- a/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
+++ b/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
@ -71,7 +71,7 @@ else ifeq ($(OPENJDK_TARGET_OS), solaris)
      -DSOLARIS_11_B159_OR_LATER
  SA_CFLAGS := $(CFLAGS_JDKLIB) $(COMMON_CFLAGS)
  SA_CXXFLAGS := $(CXXFLAGS_JDKLIB) $(COMMON_CFLAGS)
-  SA_LDFLAGS := $(subst -z defs,, $(LDFLAGS_JDKLIB)) \
+  SA_LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,, $(LDFLAGS_JDKLIB)) \
      -mt $(LDFLAGS_CXX_JDK)
  SA_LIBS := -ldl -ldemangle -lthread -lc