diff options
| author | andrew <none@none> | 2016-01-08 13:53:05 +0000 |
|---|---|---|
| committer | andrew <none@none> | 2016-01-08 13:53:05 +0000 |
| commit | 2674c3fb642ccfb2017d8684da171346b2bfee8e (patch) | |
| tree | 10739ea27f0b578ba7bf607c5d0197c2593ef03f /make | |
| parent | cf339b0abd448eb12564940f7a3b2c24a6e09f38 (diff) | |
| download | jdk8u_jdk-2674c3fb642ccfb2017d8684da171346b2bfee8e.tar.gz | |
8146566: OpenJDK build can't handle commas in LDFLAGS
Summary: Backport part of 8142907 to avoid early LDFLAGS expansion
Reviewed-by: erikj
Diffstat (limited to 'make')
| -rw-r--r-- | make/CompileDemos.gmk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk index 36829b3d3f..97bb0602e5 100644 --- a/make/CompileDemos.gmk +++ b/make/CompileDemos.gmk @@ -229,7 +229,7 @@ define SetupJVMTIDemo BUILD_DEMO_JVMTI_$1_LANG := $4 endif ifeq (C++, $4) - $1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX) + $1_EXTRA_CXX := $$(LDFLAGS_CXX_JDK) $(LIBCXX) endif $1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \ @@ -251,8 +251,8 @@ define SetupJVMTIDemo LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \ OPTIMIZATION := LOW, \ CXXFLAGS := $$($1_CXXFLAGS), \ - LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \ - LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \ + LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)), \ + LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \ LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \ LDFLAGS_SUFFIX_posix := $5, \ LDFLAGS_SUFFIX_windows := $6, \ |