Skip to content

Commit

Permalink
remove xcode switch path commands since theyre set to full path as de…
Browse files Browse the repository at this point in the history
…fault in playbooks
  • Loading branch information
Haroon-Khel committed Mar 11, 2022
1 parent c020503 commit f18bd37
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions build-farm/platform-specific-configurations/mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit f18bd37

Please sign in to comment.