From f18bd374764a6ee980813f5748a73aeedcf0a0b7 Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Fri, 11 Mar 2022 12:19:30 +0000
Subject: [PATCH 1/3] 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"

From 426b21102b6dc912f99dd59d88950b340652af4b Mon Sep 17 00:00:00 2001
From: George Adams <georgeadams1995@gmail.com>
Date: Fri, 11 Mar 2022 16:54:56 +0000
Subject: [PATCH 2/3] gh: set correct xcode version in workflow

---
 .github/workflows/build.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 303fb36b2..a51040698 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -112,10 +112,8 @@ jobs:
         java-version: 7
       if: matrix.version == 'jdk8u'
       
-    - name: Select correct Xcode
-      run: |
-        rm -rf /Applications/Xcode.app
-        ln -s /Applications/Xcode_11.7.app /Applications/Xcode.app
+    - name: Select correct Xcode (11.7)
+      run: sudo sudo xcode-select --switch /Applications/Xcode_11.7.app
 
     - name: Build macOS
       run: |

From 06607b94553d1d31e6b9e2eba0ab09850028f859 Mon Sep 17 00:00:00 2001
From: George Adams <georgeadams1995@gmail.com>
Date: Fri, 11 Mar 2022 16:58:01 +0000
Subject: [PATCH 3/3] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a51040698..1e519e41d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -113,7 +113,7 @@ jobs:
       if: matrix.version == 'jdk8u'
       
     - name: Select correct Xcode (11.7)
-      run: sudo sudo xcode-select --switch /Applications/Xcode_11.7.app
+      run: sudo xcode-select --switch /Applications/Xcode_11.7.app
 
     - name: Build macOS
       run: |