From f18bd374764a6ee980813f5748a73aeedcf0a0b7 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Fri, 11 Mar 2022 12:19:30 +0000 Subject: [PATCH] remove xcode switch path commands since theyre set to full path as default in playbooks --- build-farm/platform-specific-configurations/mac.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/build-farm/platform-specific-configurations/mac.sh b/build-farm/platform-specific-configurations/mac.sh index eeefd5eef..e10a59e66 100755 --- a/build-farm/platform-specific-configurations/mac.sh +++ b/build-farm/platform-specific-configurations/mac.sh @@ -33,7 +33,6 @@ export BUILD_ARGS="${BUILD_ARGS}" if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ] then - XCODE_SWITCH_PATH="/Applications/Xcode.app" export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-toolchain-type=clang" # See https://github.com/adoptium/temurin-build/issues/1202 if isHotSpot; then @@ -44,13 +43,6 @@ 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) - XCODE_SWITCH_PATH="/Applications/Xcode.app" - else - # Command line tools used from JDK9-JDK16 - XCODE_SWITCH_PATH="/"; - fi export PATH="/Users/jenkins/ccache-3.2.4:$PATH" if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ]; then export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched --enable-openssl-bundling" @@ -78,9 +70,6 @@ then #export BUILD_ARGS="${BUILD_ARGS} --codesign-identity 'Developer ID Application: London Jamocha Community CIC'" fi -echo "[WARNING] You may be asked for your su user password, attempting to switch Xcode version to ${XCODE_SWITCH_PATH}" -sudo xcode-select --switch "${XCODE_SWITCH_PATH}" - # No MacOS builds available of OpenJDK 7, OpenJDK 8 can boot itself just fine. if [ "${JDK_BOOT_VERSION}" == "7" ]; then echo "No jdk7 boot JDK available on MacOS using jdk8"