diff options
| author | erikj <none@none> | 2013-04-04 09:24:21 +0200 |
|---|---|---|
| committer | erikj <none@none> | 2013-04-04 09:24:21 +0200 |
| commit | a3f0be8ce8f3aef6281d92d67403d4890cb89f6b (patch) | |
| tree | 84c976873632503dd5ef8c08c0d1348bbc45eece /common/makefiles | |
| parent | cea16f2517b2fc1f61763a44c36487531390c660 (diff) | |
8006828: "SKIP_BOOT_CYCLE=false" must work in new building infrastructure
Reviewed-by: tbell, alanb
Diffstat (limited to 'common/makefiles')
| -rw-r--r-- | common/makefiles/Jprt.gmk | 4 | ||||
| -rw-r--r-- | common/makefiles/Main.gmk | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/common/makefiles/Jprt.gmk b/common/makefiles/Jprt.gmk index c70cf88..938d436 100644 --- a/common/makefiles/Jprt.gmk +++ b/common/makefiles/Jprt.gmk @@ -64,6 +64,10 @@ HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false) # Build with the configure bridge. After running configure, restart make # to parse the new spec file. BRIDGE_TARGETS := all +# Add bootcycle-images target if legacy variable is set. +ifeq ($(SKIP_BOOT_CYCLE),false) + BRIDGE_TARGETS += bootcycle-images +endif bridgeBuild: bridge2configure @cd $(root_dir) && $(MAKE) -f NewMakefile.gmk $(BRIDGE_TARGETS) diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk index 11dda4b..9e2bd40 100644 --- a/common/makefiles/Main.gmk +++ b/common/makefiles/Main.gmk @@ -175,9 +175,8 @@ sign-jars-only: start-make @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars) @$(call TargetExit) -bootcycle-images: - @$(ECHO) Boot cycle build step 1: Building the JDK image normally - @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(SPEC) images) +bootcycle-images: images bootcycle-images-only +bootcycle-images-only: start-make @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images) |