From d54dda0d8342580744c2d3dee32b505cbf2d066b Mon Sep 17 00:00:00 2001
From: Daniel Chao <dan.chao@apple.com>
Date: Mon, 2 Nov 2026 15:19:41 -0800
Subject: [PATCH] Fix macOS native builds (#1952)

`cc` is borked on some macOS runners right now.
This adds a workaround until the issue is fixed.
---
 .github/jobs/GradleJob.pkl           | 4 ++++
 .github/workflows/build.yml          | 3 +++
 .github/workflows/main.yml           | 3 +++
 .github/workflows/prb.yml            | 3 +++
 .github/workflows/release-branch.yml | 3 +++
 .github/workflows/release.yml        | 3 +++
 6 files changed, 19 insertions(+)

diff --git a/.github/jobs/GradleJob.pkl b/.github/jobs/GradleJob.pkl
index 590647f95..4196fc634 100644
--- a/.github/jobs/GradleJob.pkl
+++ b/.github/jobs/GradleJob.pkl
@@ -65,6 +65,10 @@ fixed job {
       new Listing {
         "self-hosted"
         "macos"
+        // Currently have a bug where macOS runners have `cc` from XCode 26 toolchain but have
+        // default SDK set to 27.
+        // TODO remove me once this issue is fixed.
+        "tahoe"
         when (nightlyMacOS) {
           "nightly"
         }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3b7e6143b..e8f687509 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -321,6 +321,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
@@ -644,6 +645,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
@@ -967,6 +969,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 87b3df2f3..c172bbbd0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -319,6 +319,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
@@ -642,6 +643,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
@@ -965,6 +967,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
diff --git a/.github/workflows/prb.yml b/.github/workflows/prb.yml
index 2050d5b4f..32490ed08 100644
--- a/.github/workflows/prb.yml
+++ b/.github/workflows/prb.yml
@@ -211,6 +211,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
@@ -543,6 +544,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
@@ -875,6 +877,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml
index 81760d947..743faae27 100644
--- a/.github/workflows/release-branch.yml
+++ b/.github/workflows/release-branch.yml
@@ -319,6 +319,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
@@ -642,6 +643,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
@@ -965,6 +967,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c57acef67..907adb489 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -322,6 +322,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
@@ -650,6 +651,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps:
@@ -978,6 +980,7 @@ jobs:
     runs-on:
     - self-hosted
     - macos
+    - tahoe
     env:
       LANG: en_US.UTF-8
     steps: