[packages/openjdk9.git] / CompileDemos.patch

http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-June/032544.html

--- jdk8u-jdk8u66-b02/jdk/make/CompileDemos.gmk.orig	2015-07-23 16:17:35.000000000 +0200
+++ jdk8u-jdk8u66-b02/jdk/make/CompileDemos.gmk	2015-09-18 09:52:33.000000000 +0200
@@ -246,12 +246,12 @@
       -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, \
Commit	Line	Data
d12f28e3 JK	1	http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-June/032544.html
	2
	3	--- jdk8u-jdk8u66-b02/jdk/make/CompileDemos.gmk.orig 2015-07-23 16:17:35.000000000 +0200
	4	+++ jdk8u-jdk8u66-b02/jdk/make/CompileDemos.gmk 2015-09-18 09:52:33.000000000 +0200
	5	@@ -246,12 +246,12 @@
	6	-I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
	7
	8	# Remove the -incremental:no setting to get .ilk-files like in the old build.
	9	+ BUILD_DEMO_JVMTI_$1_LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB))
	10	$$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
	11	SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
	12	LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
	13	OPTIMIZATION := LOW, \
	14	CXXFLAGS := $$($1_CXXFLAGS), \
	15	- LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
	16	LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
	17	LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
	18	LDFLAGS_SUFFIX_posix := $5, \