/hg/icedtea8-forest/jdk: PR2428: OpenJDK build can't handle comm...

[andrew at icedtea.classpath.org]

changeset adf1b3700c5b in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=adf1b3700c5b
author: andrew
date: Wed Jun 17 00:37:45 2015 +0100

	PR2428: OpenJDK build can't handle commas in LDFLAGS
	Summary: Expand LDFLAGS outside function call, as is done with CFLAGS


diffstat:

 make/CompileDemos.gmk |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 9e470ada9ea7 -r adf1b3700c5b make/CompileDemos.gmk
--- a/make/CompileDemos.gmk	Mon Jun 08 19:25:43 2015 +0100
+++ b/make/CompileDemos.gmk	Wed Jun 17 00:37:45 2015 +0100
@@ -246,12 +246,13 @@
       -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
 
   # Remove the -incremental:no setting to get .ilk-files like in the old build.
+  BUILD_DEMO_JVMTI_$1_LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB))
+  
   $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
       SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
       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_SUFFIX := $$($1_EXTRA_CXX), \
       LDFLAGS_SUFFIX_posix := $5, \