From d371b80c72aa9f70f3818829724999288f2bf7a8 Mon Sep 17 00:00:00 2001
From: rvalue <i@rvalue.moe>
Date: Thu, 18 May 2023 08:49:49 +0800
Subject: [PATCH 1/6] Bump `cc` for `bootstrap`

Bump the version of dependency `cc` to v1.0.77 for `bootstrap`, syncing with rust/Cargo.lock

Resolves #111700
---
 src/bootstrap/Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock
index 9420c4fec5fa4..d7c9e754bca2a 100644
--- a/src/bootstrap/Cargo.lock
+++ b/src/bootstrap/Cargo.lock
@@ -89,9 +89,9 @@ version = "0.1.0"
 
 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
 
 [[package]]
 name = "cfg-if"

From 64733e354ddab57c2ad8cc74ba5a08d96d03a403 Mon Sep 17 00:00:00 2001
From: rvalue <i@rvalue.moe>
Date: Mon, 22 May 2023 18:02:55 +0200
Subject: [PATCH 2/6] Try an earlier version of `cc`

This version also resolves #111700, try if we can bump to this release
without regression.
---
 src/bootstrap/Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock
index d7c9e754bca2a..1d0054d1c789f 100644
--- a/src/bootstrap/Cargo.lock
+++ b/src/bootstrap/Cargo.lock
@@ -89,9 +89,9 @@ version = "0.1.0"
 
 [[package]]
 name = "cc"
-version = "1.0.77"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574"
 
 [[package]]
 name = "cfg-if"

From 1eddb2179c3868238d442854003394d7f5a12877 Mon Sep 17 00:00:00 2001
From: rvalue <i@rvalue.moe>
Date: Mon, 22 May 2023 18:32:15 +0200
Subject: [PATCH 3/6] try test dist-apple-various

---
 .github/workflows/ci.yml     | 11 +++++++++++
 src/ci/github-actions/ci.yml | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2d8980fcd1a0d..ef7622bba77f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,6 +58,17 @@ jobs:
           - name: x86_64-gnu-tools
             os: ubuntu-20.04-16core-64gb
             env: {}
+          - name: dist-apple-various
+            env:
+              SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
+              RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
+              RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
+              MACOSX_DEPLOYMENT_TARGET: 10.7
+              SELECT_XCODE: /Applications/Xcode_13.4.1.app
+              NO_LLVM_ASSERTIONS: 1
+              NO_DEBUG_ASSERTIONS: 1
+              NO_OVERFLOW_CHECKS: 1
+            os: macos-latest
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index f81e740936ba5..546816fcbd853 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -314,6 +314,19 @@ jobs:
           - name: x86_64-gnu-tools
             <<: *job-linux-16c
 
+          - name: dist-apple-various
+            env:
+              SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
+              RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
+              RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
+              MACOSX_DEPLOYMENT_TARGET: 10.7
+              SELECT_XCODE: /Applications/Xcode_13.4.1.app
+              NO_LLVM_ASSERTIONS: 1
+              NO_DEBUG_ASSERTIONS: 1
+              NO_OVERFLOW_CHECKS: 1
+            <<: *job-macos-xl
+
+
   auto:
     permissions:
       actions: write # for rust-lang/simpleinfra/github-actions/cancel-outdated-builds

From 1b638b803d06d7006cdf68359acc73672b2a21f0 Mon Sep 17 00:00:00 2001
From: rvalue <i@rvalue.moe>
Date: Tue, 23 May 2023 06:20:33 +0200
Subject: [PATCH 4/6] try a rev of cc-rs before a sus commit

---
 src/bootstrap/Cargo.lock | 5 ++---
 src/bootstrap/Cargo.toml | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock
index 1d0054d1c789f..30855bff0eb56 100644
--- a/src/bootstrap/Cargo.lock
+++ b/src/bootstrap/Cargo.lock
@@ -89,9 +89,8 @@ version = "0.1.0"
 
 [[package]]
 name = "cc"
-version = "1.0.74"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574"
+version = "1.0.73"
+source = "git+https://github.com/rust-lang/cc-rs?rev=53fb72c87e5769a299f1886ead831901b9c775d6#53fb72c87e5769a299f1886ead831901b9c775d6"
 
 [[package]]
 name = "cfg-if"
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
index 746c8dcfce0cd..141579d03a450 100644
--- a/src/bootstrap/Cargo.toml
+++ b/src/bootstrap/Cargo.toml
@@ -92,3 +92,6 @@ debug = 0
 [profile.dev.package]
 # Only use debuginfo=1 to further reduce compile times.
 bootstrap.debug = 1
+
+[patch.crates-io]
+cc = { git = 'https://github.com/rust-lang/cc-rs', rev = '53fb72c87e5769a299f1886ead831901b9c775d6' }

From b95446d7d68f184be63ca4b36d32c38007b14d65 Mon Sep 17 00:00:00 2001
From: rvalue <i@rvalue.moe>
Date: Tue, 23 May 2023 15:25:35 +0200
Subject: [PATCH 5/6] try latest master commit of cc-rs

---
 src/bootstrap/Cargo.lock | 4 ++--
 src/bootstrap/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock
index 30855bff0eb56..250f3aa8b96e8 100644
--- a/src/bootstrap/Cargo.lock
+++ b/src/bootstrap/Cargo.lock
@@ -89,8 +89,8 @@ version = "0.1.0"
 
 [[package]]
 name = "cc"
-version = "1.0.73"
-source = "git+https://github.com/rust-lang/cc-rs?rev=53fb72c87e5769a299f1886ead831901b9c775d6#53fb72c87e5769a299f1886ead831901b9c775d6"
+version = "1.0.79"
+source = "git+https://github.com/rust-lang/cc-rs?rev=57853c4bf8a89a0f4c9137eb367ac580305c6919#57853c4bf8a89a0f4c9137eb367ac580305c6919"
 
 [[package]]
 name = "cfg-if"
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
index 141579d03a450..cd11de548b56f 100644
--- a/src/bootstrap/Cargo.toml
+++ b/src/bootstrap/Cargo.toml
@@ -94,4 +94,4 @@ debug = 0
 bootstrap.debug = 1
 
 [patch.crates-io]
-cc = { git = 'https://github.com/rust-lang/cc-rs', rev = '53fb72c87e5769a299f1886ead831901b9c775d6' }
+cc = { git = 'https://github.com/rust-lang/cc-rs', rev = '57853c4bf8a89a0f4c9137eb367ac580305c6919' }

From fd1c67203d92019fc1bbd77ce4a1df95974fe459 Mon Sep 17 00:00:00 2001
From: rvalue <i@rvalue.moe>
Date: Tue, 23 May 2023 18:02:50 +0200
Subject: [PATCH 6/6] try remove `SDKROOT` and bump to cc-rs 1.0.77

---
 src/bootstrap/Cargo.lock        | 5 +++--
 src/bootstrap/Cargo.toml        | 3 ---
 src/ci/scripts/install-clang.sh | 7 -------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock
index 250f3aa8b96e8..d7c9e754bca2a 100644
--- a/src/bootstrap/Cargo.lock
+++ b/src/bootstrap/Cargo.lock
@@ -89,8 +89,9 @@ version = "0.1.0"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
-source = "git+https://github.com/rust-lang/cc-rs?rev=57853c4bf8a89a0f4c9137eb367ac580305c6919#57853c4bf8a89a0f4c9137eb367ac580305c6919"
+version = "1.0.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
 
 [[package]]
 name = "cfg-if"
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
index cd11de548b56f..746c8dcfce0cd 100644
--- a/src/bootstrap/Cargo.toml
+++ b/src/bootstrap/Cargo.toml
@@ -92,6 +92,3 @@ debug = 0
 [profile.dev.package]
 # Only use debuginfo=1 to further reduce compile times.
 bootstrap.debug = 1
-
-[patch.crates-io]
-cc = { git = 'https://github.com/rust-lang/cc-rs', rev = '57853c4bf8a89a0f4c9137eb367ac580305c6919' }
diff --git a/src/ci/scripts/install-clang.sh b/src/ci/scripts/install-clang.sh
index 02b72625d6eb5..4375febe22f36 100755
--- a/src/ci/scripts/install-clang.sh
+++ b/src/ci/scripts/install-clang.sh
@@ -27,13 +27,6 @@ if isMacOS; then
     ciCommandSetEnv CC "${bindir}/clang"
     ciCommandSetEnv CXX "${bindir}/clang++"
 
-    # macOS 10.15 onwards doesn't have libraries in /usr/include anymore: those
-    # are now located deep into the filesystem, under Xcode's own files. The
-    # native clang is configured to use the correct path, but our custom one
-    # doesn't. This sets the SDKROOT environment variable to the SDK so that
-    # our own clang can figure out the correct include path on its own.
-    ciCommandSetEnv SDKROOT "$(xcrun --sdk macosx --show-sdk-path)"
-
     # Configure `AR` specifically so rustbuild doesn't try to infer it as
     # `clang-ar` by accident.
     ciCommandSetEnv AR "ar"