Add -isysroot for xctoolchain cc

Author: youknowone

src/lib.rs

@@ -2427,7 +2427,7 @@ impl Build {
                 _ => {
                     return Err(Error::new(
                         ErrorKind::ArchitectureInvalid,
-                        "Unknown architecture for iOS simulator target.",
+                        "Unknown architecture for simulator target.",
                     ));
                 }
             }
@@ -2485,7 +2485,8 @@ impl Build {
             ArchSpec::Catalyst(_) => "macosx".to_owned(),
         };
 
-        if !is_mac {
+        // AppleClang sometimes requires sysroot even for darwin
+        if cmd.is_xctoolchain_clang() || !target.ends_with("-darwin") {
             self.print(&format_args!("Detecting {:?} SDK path for {}", os, sdk));
             let sdk_path = if let Some(sdkroot) = env::var_os("SDKROOT") {
                 sdkroot
@@ -2495,7 +2496,10 @@ impl Build {
 
             cmd.args.push("-isysroot".into());
             cmd.args.push(sdk_path);
-            // TODO: Remove this once Apple stops accepting apps built with Xcode 13
+        }
+
+        // TODO: Remove this once Apple stops accepting apps built with Xcode 13
+        if !is_mac {
             cmd.args.push("-fembed-bitcode".into());
         }
 
@@ -3684,6 +3688,17 @@ impl Tool {
         self.family == ToolFamily::Clang
     }
 
+    /// Whether the tool is AppleClang under .xctoolchain
+    #[cfg(target_vendor = "apple")]
+    fn is_xctoolchain_clang(&self) -> bool {
+        let path = self.path.to_str().unwrap();
+        path.contains(".xctoolchain/")
+    }
+    #[cfg(not(target_vendor = "apple"))]
+    fn is_xctoolchain_clang(&self) -> bool {
+        false
+    }
+
     /// Whether the tool is MSVC-like.
     pub fn is_like_msvc(&self) -> bool {
         match self.family {

tests/test.rs

@@ -489,7 +489,9 @@ fn gnu_apple_darwin() {
             .file("foo.c")
             .compile("foo");
 
+        let cmd = test.cmd(0);
         test.cmd(0)
             .must_have(format!("-mmacosx-version-min={}", version));
+        cmd.must_not_have("-isysroot");
     }
 }