From ab5de45636f0bf96e52c0ae0dcf080f279d9caee Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Mon, 2 Jun 2025 16:50:10 +0000 Subject: [PATCH] 8357991: make bootcycle-images is broken after JDK-8349665 Reviewed-by: erikj --- make/Main.gmk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/make/Main.gmk b/make/Main.gmk index 6a800a2edd5..c1b84dc1855 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -417,12 +417,22 @@ $(eval $(call SetupTarget, create-source-revision-tracker, \ )) BOOTCYCLE_TARGET := product-images +BOOTCYCLE_SPEC := $(dir $(SPEC))bootcycle-spec.gmk + bootcycle-images: ifneq ($(COMPILE_TYPE), cross) $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image) $(call MakeDir, $(OUTPUTDIR)/bootcycle-build) + # We need to create essential files for the bootcycle spec dir + ( cd $(TOPDIR) && \ + $(MAKE) $(MAKE_ARGS) -f make/GenerateFindTests.gmk \ + SPEC=$(BOOTCYCLE_SPEC)) + ( cd $(TOPDIR) && \ + $(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Main.gmk \ + SPEC=$(BOOTCYCLE_SPEC) UPDATE_MODULE_DEPS=true NO_RECIPES=true \ + create-main-targets-include ) +$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \ - LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main + LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(BOOTCYCLE_SPEC) main else $(call LogWarn, Boot cycle build disabled when cross compiling) endif