From c1e0cbe3adf3181c81cf1cfaa39d65bb7d38ea8b Mon Sep 17 00:00:00 2001 From: Stewart X Addison <6487691+sxa@users.noreply.github.com> Date: Wed, 6 Apr 2022 16:53:14 +0100 Subject: [PATCH] Use full xcode for MacOS/aarch64 JDK11 (#2885) Signed-off-by: Stewart X Addison --- build-farm/platform-specific-configurations/mac.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-farm/platform-specific-configurations/mac.sh b/build-farm/platform-specific-configurations/mac.sh index a02733a65..74c353c66 100755 --- a/build-farm/platform-specific-configurations/mac.sh +++ b/build-farm/platform-specific-configurations/mac.sh @@ -30,8 +30,8 @@ then export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched --enable-openssl-bundling" fi else - if [[ "$JAVA_FEATURE_VERSION" -ge 17 ]]; then - # JDK17 requires metal (included in full xcode) + if [[ "$JAVA_FEATURE_VERSION" -ge 17 ]] || [[ "${ARCHITECTURE}" == "aarch64" ]]; then + # JDK17 requires metal (included in full xcode) as does JDK11 on aarch64 XCODE_SWITCH_PATH="/Applications/Xcode.app" else # Command line tools used from JDK9-JDK16