From ebac6beb700a78c2da008dd763538b3bfc73e9d1 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Tue, 17 Jan 2017 14:14:24 +0100 Subject: [PATCH] 8170863: Always pass MAKE_ARGS to MAKE in Main.gmk Reviewed-by: erikj --- make/Main.gmk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/make/Main.gmk b/make/Main.gmk index a94e8ca60b1..22f43c2317d 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -247,7 +247,7 @@ 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 \ + +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f gensrc/GenerateSources.gmk \ JVM_VARIANT=$1) endef @@ -255,14 +255,14 @@ $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotGensrcRecipe,$v))) 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 @@ ALL_TARGETS += demos-jdk samples-jdk # 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_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) \ + +$(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)