Merge branch 'master' into add_mac_sbom_repro

adoptium · May 15, 2024 · 39ec87e · 39ec87e
2 parents b588be1 + f4f2318
commit 39ec87e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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
 }