--- a/make/Main.gmk Thu Oct 01 11:52:43 2015 -0700
+++ b/make/Main.gmk Thu Oct 08 11:31:14 2015 -1000
@@ -107,6 +107,7 @@
JDK_GENSRC_TARGETS := $(filter %-gensrc-jdk, $(GENSRC_TARGETS))
LANGTOOLS_GENSRC_TARGETS := $(filter %-gensrc-langtools, $(GENSRC_TARGETS))
CORBA_GENSRC_TARGETS := $(filter %-gensrc-corba, $(GENSRC_TARGETS))
+HOTSPOT_GENSRC_TARGETS := $(filter %-gensrc-hotspot, $(GENSRC_TARGETS))
ALL_TARGETS += $(GENSRC_TARGETS)
@@ -128,7 +129,8 @@
FILE_PREFIX := Copy, \
MAKE_SUBDIR := copy, \
CHECK_MODULES := $(ALL_MODULES), \
- USE_WRAPPER := true))
+ USE_WRAPPER := true, \
+ MULTIPLE_MAKEFILES := true))
ALL_TARGETS += $(COPY_TARGETS)
@@ -352,6 +354,8 @@
$(CORBA_GENSRC_TARGETS): interim-langtools
+ $(HOTSPOT_GENSRC_TARGETS): interim-langtools
+
$(JDK_GENSRC_TARGETS): interim-langtools buildtools-jdk
$(GENDATA_TARGETS): interim-langtools buildtools-jdk
@@ -415,6 +419,9 @@
# Explicitly add dependencies for special targets
java.base-java: unpack-sec
+ # The copy target copies files generated by gensrc
+ java.base-copy-hotspot: java.base-gensrc-hotspot
+
jdk.jdeps-gendata: java rmic
zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \