make/Main.gmk

*** 108,117 ****
--- 108,118 ----
      MULTIPLE_MAKEFILES := true))
  
  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)
  
  ################################################################################
  # Generate data targets
*** 129,139 ****
  $(eval $(call DeclareRecipesForPhase, COPY, \
      TARGET_SUFFIX := copy, \
      FILE_PREFIX := Copy, \
      MAKE_SUBDIR := copy, \
      CHECK_MODULES := $(ALL_MODULES), \
!     USE_WRAPPER := true))
  
  ALL_TARGETS += $(COPY_TARGETS)
  
  ################################################################################
  # Targets for compiling all java modules. Nashorn is treated separately.
--- 130,141 ----
  $(eval $(call DeclareRecipesForPhase, COPY, \
      TARGET_SUFFIX := copy, \
      FILE_PREFIX := Copy, \
      MAKE_SUBDIR := copy, \
      CHECK_MODULES := $(ALL_MODULES), \
!     USE_WRAPPER := true, \
!     MULTIPLE_MAKEFILES := true))
  
  ALL_TARGETS += $(COPY_TARGETS)
  
  ################################################################################
  # Targets for compiling all java modules. Nashorn is treated separately.
*** 350,359 ****
--- 352,363 ----
  
    buildtools-jdk: interim-langtools interim-cldrconverter
  
    $(CORBA_GENSRC_TARGETS): interim-langtools
  
+   $(HOTSPOT_GENSRC_TARGETS): interim-langtools
+ 
    $(JDK_GENSRC_TARGETS): interim-langtools buildtools-jdk
  
    interim-corba: $(CORBA_GENSRC_TARGETS)
  
    $(GENDATA_TARGETS): interim-langtools buildtools-jdk
*** 415,424 ****
--- 419,431 ----
    java.desktop-gensrc-jdk: java.base-gensrc
  
    # 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 \
        $(filter jdk.crypto%, $(JAVA_TARGETS))