make/Main.gmk

*** 83,96 ****
    buildtools-jdk:
          +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk)
  
    buildtools-modules:
          +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
  endif
  
  ALL_TARGETS += buildtools-langtools interim-langtools \
!     interim-rmic interim-cldrconverter buildtools-jdk buildtools-modules
  
  ################################################################################
  # Special targets for certain modules
  
  unpack-sec:
--- 83,100 ----
    buildtools-jdk:
          +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk)
  
    buildtools-modules:
          +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
+ 
+   buildtools-hotspot:
+         +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk)
  endif
  
  ALL_TARGETS += buildtools-langtools interim-langtools \
!     interim-rmic interim-cldrconverter buildtools-jdk buildtools-modules \
!     buildtools-hotspot
  
  ################################################################################
  # Special targets for certain modules
  
  unpack-sec:
*** 513,527 ****
  
    interim-langtools: $(LANGTOOLS_GENSRC_TARGETS)
  
    buildtools-jdk: interim-langtools interim-cldrconverter
  
    buildtools-modules: exploded-image-base
  
    $(CORBA_GENSRC_TARGETS): interim-langtools
  
!   $(HOTSPOT_GENSRC_TARGETS): interim-langtools
  
    $(JDK_GENSRC_TARGETS): interim-langtools buildtools-jdk
  
    $(GENSRC_MODULEINFO_TARGETS): buildtools-jdk
  
--- 517,533 ----
  
    interim-langtools: $(LANGTOOLS_GENSRC_TARGETS)
  
    buildtools-jdk: interim-langtools interim-cldrconverter
  
+   buildtools-hotspot: interim-langtools
+ 
    buildtools-modules: exploded-image-base
  
    $(CORBA_GENSRC_TARGETS): interim-langtools
  
!   $(HOTSPOT_GENSRC_TARGETS): interim-langtools buildtools-hotspot
  
    $(JDK_GENSRC_TARGETS): interim-langtools buildtools-jdk
  
    $(GENSRC_MODULEINFO_TARGETS): buildtools-jdk
  
*** 587,596 ****
--- 593,610 ----
  
    # The annotation processing for jdk.vm.ci needs java.base classes from the
    # current JDK.
    jdk.vm.ci-gensrc-hotspot: java.base-java
  
+   # The annotation processing for jdk.vm.compiler needs classes from the current JDK.
+   jdk.vm.compiler-gensrc-hotspot: java.base-java java.management-java \
+       jdk.management-java jdk.vm.ci-java jdk.unsupported-java
+ 
+   # For jdk.vm.compiler, the gensrc step is generating a module-info.java.extra
+   # file to be processed by the gensrc-moduleinfo target.
+   jdk.vm.compiler-gensrc-moduleinfo: jdk.vm.compiler-gensrc-hotspot
+ 
    # Explicitly add dependencies for special targets
    java.base-java: unpack-sec
  
    jdk.jdeps-gendata: java rmic
  
*** 736,746 ****
  
  ################################################################################
  # Virtual targets without recipes
  
  buildtools: buildtools-langtools interim-langtools interim-rmic \
!     buildtools-jdk
  
  gensrc: $(GENSRC_TARGETS)
  
  gendata: $(GENDATA_TARGETS)
  
--- 750,760 ----
  
  ################################################################################
  # Virtual targets without recipes
  
  buildtools: buildtools-langtools interim-langtools interim-rmic \
!     buildtools-jdk buildtools-hotspot
  
  gensrc: $(GENSRC_TARGETS)
  
  gendata: $(GENDATA_TARGETS)