stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8339371: jlink.log warning when building after JDK-8338404

Browse Source 
Reviewed-by: erikj, alanb
This commit is contained in:
Magnus Ihse Bursie 2024-09-04 10:35:04 +00:00
parent 7ad61605f1
commit 4e2dde2f0d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
make/InterimImage.gmk
View File

@ -27,12 +27,13 @@ default: all
include $(SPEC) include $(SPEC)
include MakeBase.gmk include MakeBase.gmk
include Execute.gmk
include Modules.gmk include Modules.gmk
################################################################################ ################################################################################
# Use this file inside the image as target for make rule INTERIM_JLINK_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/interim-image-jlink
JIMAGE_TARGET_FILE := bin/java$(EXECUTABLE_SUFFIX)
INTERIM_MODULES_LIST := $(call CommaList, $(INTERIM_IMAGE_MODULES)) INTERIM_MODULES_LIST := $(call CommaList, $(INTERIM_IMAGE_MODULES))
@ -42,19 +43,18 @@ JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
--module-path $(INTERIM_JMODS_DIR) \ --module-path $(INTERIM_JMODS_DIR) \
--endian $(OPENJDK_BUILD_CPU_ENDIAN) --endian $(OPENJDK_BUILD_CPU_ENDIAN)
$(INTERIM_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ $(eval $(call SetupExecute, jlink_interim_image, \
$(call DependOnVariable, INTERIM_MODULES_LIST) WARN := Creating interim jimage, \
$(call LogWarn, Creating interim jimage) DEPS := $(JMODS) $(call DependOnVariable, INTERIM_MODULES_LIST), \
$(RM) -r $(INTERIM_IMAGE_DIR) OUTPUT_DIR := $(INTERIM_IMAGE_DIR), \
$(call MakeDir, $(INTERIM_IMAGE_DIR)) SUPPORT_DIR := $(INTERIM_JLINK_SUPPORT_DIR), \
$(call ExecuteWithLog, $(INTERIM_IMAGE_DIR)/jlink, \ PRE_COMMAND := $(RM) -r $(INTERIM_IMAGE_DIR), \
$(JLINK_TOOL) \ COMMAND := $(JLINK_TOOL) --output $(INTERIM_IMAGE_DIR) \
--output $(INTERIM_IMAGE_DIR) \ --disable-plugin generate-jli-classes \
--disable-plugin generate-jli-classes \ --add-modules $(INTERIM_MODULES_LIST), \
--add-modules $(INTERIM_MODULES_LIST)) ))
$(TOUCH) $@
TARGETS += $(INTERIM_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) TARGETS += $(jlink_interim_image)
################################################################################ ################################################################################