make/Main.gmk

*** 245,270 ****
  HOTSPOT_VARIANT_LIBS_TARGETS := $(addsuffix -libs, $(HOTSPOT_VARIANT_TARGETS))
  
  define DeclareHotspotGensrcRecipe
    hotspot-$1-gensrc:
          $$(call LogInfo, Building JVM variant '$1' with features '$(JVM_FEATURES_$1)')
!         +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f gensrc/GenerateSources.gmk \
              JVM_VARIANT=$1)
  endef
  
  $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotGensrcRecipe,$v)))
  
  define DeclareHotspotLibsRecipe
    hotspot-$1-libs:
!         +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibraries.gmk \
              JVM_VARIANT=$1)
  endef
  
  $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
  
  hotspot-jsig:
!         +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibjsig.gmk)
  
  hotspot-ide-project:
          +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
  
  ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
--- 245,270 ----
  HOTSPOT_VARIANT_LIBS_TARGETS := $(addsuffix -libs, $(HOTSPOT_VARIANT_TARGETS))
  
  define DeclareHotspotGensrcRecipe
    hotspot-$1-gensrc:
          $$(call LogInfo, Building JVM variant '$1' with features '$(JVM_FEATURES_$1)')
!         +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f gensrc/GenerateSources.gmk \
              JVM_VARIANT=$1)
  endef
  
  $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotGensrcRecipe,$v)))
  
  define DeclareHotspotLibsRecipe
    hotspot-$1-libs:
!         +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibraries.gmk \
              JVM_VARIANT=$1)
  endef
  
  $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
  
  hotspot-jsig:
!         +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibjsig.gmk)
  
  hotspot-ide-project:
          +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
  
  ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
*** 283,293 ****
  
  ################################################################################
  # Jigsaw specific data and analysis targets.
  
  generate-summary:
!         +($(CD) $(JDK_TOPDIR)/make && $(MAKE) -f GenerateModuleSummary.gmk)
  
  ALL_TARGETS += generate-summary
  
  ################################################################################
  # Jmod targets
--- 283,293 ----
  
  ################################################################################
  # Jigsaw specific data and analysis targets.
  
  generate-summary:
!         +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GenerateModuleSummary.gmk)
  
  ALL_TARGETS += generate-summary
  
  ################################################################################
  # Jmod targets
*** 316,326 ****
  
  BOOTCYCLE_TARGET := product-images
  bootcycle-images:
          ifneq ($(COMPILE_TYPE), cross)
            $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
!           +$(MAKE) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
                JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
          else
            $(call LogWarn, Boot cycle build disabled when cross compiling)
          endif
  
--- 316,326 ----
  
  BOOTCYCLE_TARGET := product-images
  bootcycle-images:
          ifneq ($(COMPILE_TYPE), cross)
            $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
!           +$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
                JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
          else
            $(call LogWarn, Boot cycle build disabled when cross compiling)
          endif