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

8352692: Add support for extra jlink options

Browse Source 
Reviewed-by: ihse, erikj
This commit is contained in:
Severin Gehwolf 2025-03-26 10:53:07 +00:00
parent 059f190f4b
commit bc5cde1b19
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/Images.gmk
View File

@ -97,6 +97,10 @@ ifeq ($(JLINK_PRODUCE_LINKABLE_RUNTIME), true)
JLINK_JDK_EXTRA_OPTS += --generate-linkable-runtime JLINK_JDK_EXTRA_OPTS += --generate-linkable-runtime
endif endif
ifneq ($(JLINK_USER_EXTRA_FLAGS), )
JLINK_JDK_EXTRA_OPTS += $(JLINK_USER_EXTRA_FLAGS)
endif
$(eval $(call SetupExecute, jlink_jdk, \ $(eval $(call SetupExecute, jlink_jdk, \
WARN := Creating jdk image, \ WARN := Creating jdk image, \
DEPS := $(JDK_JMODS) $(BASE_RELEASE_FILE) \ DEPS := $(JDK_JMODS) $(BASE_RELEASE_FILE) \

12
make/autoconf/jdk-options.m4
View File

@ -620,6 +620,18 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JLINK_OPTIONS],
DEFAULT_DESC: [enabled by default unless --enable-linkable-runtime is set], DEFAULT_DESC: [enabled by default unless --enable-linkable-runtime is set],
CHECKING_MSG: [if packaged modules are kept]) CHECKING_MSG: [if packaged modules are kept])
AC_SUBST(JLINK_KEEP_PACKAGED_MODULES) AC_SUBST(JLINK_KEEP_PACKAGED_MODULES)
################################################################################
#
# Extra jlink options to be (optionally) passed to the JDK build
#
UTIL_ARG_WITH(NAME: extra-jlink-flags, TYPE: string,
DEFAULT: [],
DESC: [extra flags to be passed to jlink during the build],
OPTIONAL: true)
JLINK_USER_EXTRA_FLAGS="$EXTRA_JLINK_FLAGS"
AC_SUBST(JLINK_USER_EXTRA_FLAGS)
]) ])
################################################################################ ################################################################################

1
make/autoconf/spec.gmk.template
View File

@ -712,6 +712,7 @@ NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS)
JMOD_COMPRESS := @JMOD_COMPRESS@ JMOD_COMPRESS := @JMOD_COMPRESS@
JLINK_KEEP_PACKAGED_MODULES := @JLINK_KEEP_PACKAGED_MODULES@ JLINK_KEEP_PACKAGED_MODULES := @JLINK_KEEP_PACKAGED_MODULES@
JLINK_PRODUCE_LINKABLE_RUNTIME := @JLINK_PRODUCE_LINKABLE_RUNTIME@ JLINK_PRODUCE_LINKABLE_RUNTIME := @JLINK_PRODUCE_LINKABLE_RUNTIME@
JLINK_USER_EXTRA_FLAGS := @JLINK_USER_EXTRA_FLAGS@
RCFLAGS := @RCFLAGS@ RCFLAGS := @RCFLAGS@