1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8358515: make cmp-baseline is broken after JDK-8349665

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2025-06-03 19:23:29 +00:00
parent cc11b7d1f5
commit a44a470052
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
make/Init.gmk
View File

@ -110,7 +110,18 @@ reconfigure:
CUSTOM_CONFIG_DIR="$(CUSTOM_CONFIG_DIR)" \ CUSTOM_CONFIG_DIR="$(CUSTOM_CONFIG_DIR)" \
$(RECONFIGURE_COMMAND) ) $(RECONFIGURE_COMMAND) )
.PHONY: print-modules print-targets print-tests print-configuration reconfigure # Create files that are needed to run most targets in Main.gmk
create-make-helpers:
( cd $(TOPDIR) && \
$(MAKE) $(MAKE_ARGS) -j 1 -f make/GenerateFindTests.gmk \
$(USER_MAKE_VARS) )
( cd $(TOPDIR) && \
$(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
UPDATE_MODULE_DEPS=true NO_RECIPES=true \
create-main-targets-include )
.PHONY: print-modules print-targets print-tests print-configuration \
reconfigure create-make-helpers
############################################################################## ##############################################################################
# The main target. This will delegate all other targets into Main.gmk. # The main target. This will delegate all other targets into Main.gmk.
@ -130,7 +141,7 @@ TARGET_DESCRIPTION := target$(if $(word 2, $(MAIN_TARGETS)),s) \
# variables are explicitly propagated using $(USER_MAKE_VARS). # variables are explicitly propagated using $(USER_MAKE_VARS).
main: MAKEOVERRIDES := main: MAKEOVERRIDES :=
main: $(INIT_TARGETS) main: $(INIT_TARGETS) create-make-helpers
ifneq ($(SEQUENTIAL_TARGETS)$(PARALLEL_TARGETS), ) ifneq ($(SEQUENTIAL_TARGETS)$(PARALLEL_TARGETS), )
$(call RotateLogFiles) $(call RotateLogFiles)
$(ECHO) "Building $(TARGET_DESCRIPTION)" $(BUILD_LOG_PIPE_SIMPLE) $(ECHO) "Building $(TARGET_DESCRIPTION)" $(BUILD_LOG_PIPE_SIMPLE)
@ -142,12 +153,7 @@ main: $(INIT_TARGETS)
$(SEQUENTIAL_TARGETS) ) $(SEQUENTIAL_TARGETS) )
# We might have cleaned away essential files, recreate them. # We might have cleaned away essential files, recreate them.
( cd $(TOPDIR) && \ ( cd $(TOPDIR) && \
$(MAKE) $(MAKE_ARGS) -j 1 -f make/GenerateFindTests.gmk \ $(MAKE) $(MAKE_ARGS) -j 1 -f make/Init.gmk create-make-helpers )
$(USER_MAKE_VARS) )
( cd $(TOPDIR) && \
$(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
UPDATE_MODULE_DEPS=true NO_RECIPES=true \
create-main-targets-include )
endif endif
ifneq ($(PARALLEL_TARGETS), ) ifneq ($(PARALLEL_TARGETS), )
$(call PrepareFailureLogs) $(call PrepareFailureLogs)

8
make/Main.gmk
View File

@ -423,14 +423,6 @@ bootcycle-images:
ifneq ($(COMPILE_TYPE), cross) ifneq ($(COMPILE_TYPE), cross)
$(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image) $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
$(call MakeDir, $(OUTPUTDIR)/bootcycle-build) $(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) \ +$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(BOOTCYCLE_SPEC) main LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(BOOTCYCLE_SPEC) main
else else

3
make/PreInit.gmk
View File

@ -50,7 +50,8 @@ include $(TOPDIR)/make/Global.gmk
# Targets provided by Init.gmk. # Targets provided by Init.gmk.
ALL_INIT_TARGETS := print-modules print-targets print-configuration \ ALL_INIT_TARGETS := print-modules print-targets print-configuration \
print-tests reconfigure pre-compare-build post-compare-build print-tests reconfigure pre-compare-build post-compare-build \
create-make-helpers
# CALLED_TARGETS is the list of targets that the user provided, # CALLED_TARGETS is the list of targets that the user provided,
# or "default" if unspecified. # or "default" if unspecified.