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

diff -dur -x '*~' -x '*.orig' -x '*.rej' jdk8u-jdk8u92-b31.orig/jdk/make/CompileDemos.gmk jdk8u-jdk8u92-b31/jdk/make/CompileDemos.gmk
--- jdk8u-jdk8u92-b31.orig/jdk/make/CompileDemos.gmk	2016-04-06 07:27:01.000000000 +0200
+++ jdk8u-jdk8u92-b31/jdk/make/CompileDemos.gmk	2016-07-29 09:37:19.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, \