OpenJDK / jdk / jdk10
changeset 43170:74de87954852
8170863: Always pass MAKE_ARGS to MAKE in Main.gmk
Reviewed-by: erikj
| author | ihse |
|---|---|
| date | Tue, 17 Jan 2017 14:14:24 +0100 |
| parents | d7034ff7f8e2 |
| children | 61b58ba86188 |
| files | make/Main.gmk |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Main.gmk Wed Jul 05 22:42:09 2017 +0200 +++ b/make/Main.gmk Tue Jan 17 14:14:24 2017 +0100 @@ -247,7 +247,7 @@ 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 \ + +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f gensrc/GenerateSources.gmk \ JVM_VARIANT=$1) endef @@ -255,14 +255,14 @@ define DeclareHotspotLibsRecipe hotspot-$1-libs: - +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibraries.gmk \ + +($(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) -f lib/CompileLibjsig.gmk) + +($(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) @@ -285,7 +285,7 @@ # Jigsaw specific data and analysis targets. generate-summary: - +($(CD) $(JDK_TOPDIR)/make && $(MAKE) -f GenerateModuleSummary.gmk) + +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GenerateModuleSummary.gmk) ALL_TARGETS += generate-summary @@ -318,7 +318,7 @@ 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) \ + +$(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)