Skip to content

Commit f18bd37

Browse files
committed
remove xcode switch path commands since theyre set to full path as default in playbooks
1 parent c020503 commit f18bd37

File tree

1 file changed

+0
-11
lines changed
  • build-farm/platform-specific-configurations

1 file changed

+0
-11
lines changed

build-farm/platform-specific-configurations/mac.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ export BUILD_ARGS="${BUILD_ARGS}"
3333

3434
if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ]
3535
then
36-
XCODE_SWITCH_PATH="/Applications/Xcode.app"
3736
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-toolchain-type=clang"
3837
# See https://github.com/adoptium/temurin-build/issues/1202
3938
if isHotSpot; then
@@ -44,13 +43,6 @@ then
4443
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched --enable-openssl-bundling"
4544
fi
4645
else
47-
if [[ "$JAVA_FEATURE_VERSION" -ge 17 ]]; then
48-
# JDK17 requires metal (included in full xcode)
49-
XCODE_SWITCH_PATH="/Applications/Xcode.app"
50-
else
51-
# Command line tools used from JDK9-JDK16
52-
XCODE_SWITCH_PATH="/";
53-
fi
5446
export PATH="/Users/jenkins/ccache-3.2.4:$PATH"
5547
if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ]; then
5648
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched --enable-openssl-bundling"
@@ -78,9 +70,6 @@ then
7870
#export BUILD_ARGS="${BUILD_ARGS} --codesign-identity 'Developer ID Application: London Jamocha Community CIC'"
7971
fi
8072

81-
echo "[WARNING] You may be asked for your su user password, attempting to switch Xcode version to ${XCODE_SWITCH_PATH}"
82-
sudo xcode-select --switch "${XCODE_SWITCH_PATH}"
83-
8473
# No MacOS builds available of OpenJDK 7, OpenJDK 8 can boot itself just fine.
8574
if [ "${JDK_BOOT_VERSION}" == "7" ]; then
8675
echo "No jdk7 boot JDK available on MacOS using jdk8"

0 commit comments

Comments
 (0)