From 698313c1bf2d036c334492a387586e2c0544aa6b Mon Sep 17 00:00:00 2001 From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com> Date: Fri, 20 Oct 2023 11:03:51 +0100 Subject: [PATCH] jdk8 select Xcode-11.7 only when cross-compiling (#3507) Signed-off-by: Andrew Leonard --- build-farm/platform-specific-configurations/mac.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-farm/platform-specific-configurations/mac.sh b/build-farm/platform-specific-configurations/mac.sh index 94118627f..f3fff066a 100755 --- a/build-farm/platform-specific-configurations/mac.sh +++ b/build-farm/platform-specific-configurations/mac.sh @@ -33,12 +33,14 @@ fi if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ] then - XCODE_SWITCH_PATH="/Applications/Xcode-11.7.app" export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-toolchain-type=clang" if [[ "${MACHINEARCHITECTURE}" == "arm64" ]] && [[ "${ARCHITECTURE}" == "x64" ]]; then # Cross compilation config needed only for jdk8 export MAC_ROSETTA_PREFIX="arch -x86_64" export PATH=/opt/homebrew/bin:/usr/local/bin:$PATH + XCODE_SWITCH_PATH="/Applications/Xcode-11.7.app" + else + XCODE_SWITCH_PATH="/Applications/Xcode.app" fi if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ]; then export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched --enable-openssl-bundling"