From f4f23184b8102e1d069d2b9def13b5a6d0aa1b04 Mon Sep 17 00:00:00 2001
From: "Keith W. Campbell" <keithc@ca.ibm.com>
Date: Wed, 15 May 2024 13:00:18 -0400
Subject: [PATCH] Don't use --enable-compatible-cds-alignment for OpenJ9 builds
 (#3814)

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
---
 sbin/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sbin/build.sh b/sbin/build.sh
index 9c9c2a8a8..898566a2f 100755
--- a/sbin/build.sh
+++ b/sbin/build.sh
@@ -453,7 +453,8 @@ buildingTheRestOfTheConfigParameters() {
 
   # For jdk-17+ aarch64 linux, we need to add --enable-compatible-cds-alignment, until upstream
   # fix for https://bugs.openjdk.org/browse/JDK-8331942 is merged into all jdk-17+ versions
-  if [ "${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}" -ge 17 ] && [ "${BUILD_CONFIG[OS_KERNEL_NAME]}" == "linux" ] && [ "${BUILD_CONFIG[OS_ARCHITECTURE]}" == "aarch64" ]; then
+  # (but not for OpenJ9 where it's not supported)
+  if [ "${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}" -ge 17 ] && [ "${BUILD_CONFIG[OS_KERNEL_NAME]}" == "linux" ] && [ "${BUILD_CONFIG[OS_ARCHITECTURE]}" == "aarch64" ] && [ "${BUILD_CONFIG[BUILD_VARIANT]}" != "${BUILD_VARIANT_OPENJ9}" ]; then
     addConfigureArg "--enable-compatible-cds-alignment" ""
   fi
 }