From 2e771530570a18f47708c0e174bf6d63bdc7a229 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: Thu, 14 Nov 2024 11:55:19 +0100
Subject: [PATCH] Add --enable-linkable-runtime for JDK 24+

For JDK's including JEP 493, enable the build option
for producing a jlink that is capable of linking from
the run-time image.

Closes #4035
---
 sbin/build.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sbin/build.sh b/sbin/build.sh
index 27a314f9f..14c8ffbac 100755
--- a/sbin/build.sh
+++ b/sbin/build.sh
@@ -174,6 +174,17 @@ configureMacOSCodesignParameter() {
   fi
 }
 
+# JDK 24+ includes JEP 493 which allows for the JDK to enable
+# linking from the run-time image (instead of only from JMODs). Enable
+# this option. This has the effect, that no 'jmods' directory will be
+# produced in the resulting build. Thus, the tarball and, especially the
+# extracted tarball will be smaller in terms of disk space size.
+configureLinkableRuntimeParameter() {
+  if [[ "${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}" -ge 24 ]]; then
+    addConfigureArg "--enable-linkable-runtime" ""
+  fi
+}
+
 # Get the OpenJDK update version and build version
 getOpenJDKUpdateAndBuildVersion() {
   cd "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}"
@@ -574,6 +585,7 @@ configureCommandParameters() {
   configureVersionStringParameter
   configureBootJDKConfigureParameter
   configureDevKitConfigureParameter
+  configureLinkableRuntimeParameter
   configureShenandoahBuildParameter
   configureMacOSCodesignParameter
   configureDebugParameters