8146566: OpenJDK build can't handle commas in LDFLAGS
Summary: Backport part of 8142907 to avoid early LDFLAGS expansion
Reviewed-by: erikj
diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk
index 36829b3..97bb060 100644
--- a/make/CompileDemos.gmk
+++ b/make/CompileDemos.gmk
@@ -229,7 +229,7 @@
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 @@
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, \