Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3653,8 +3653,43 @@ impl Build {
}

fn apple_sdk_root(&self, sdk: &str) -> Result<OsString, Error> {
// Code copied from rustc's compiler/rustc_codegen_ssa/src/back/link.rs.
if let Some(sdkroot) = env::var_os("SDKROOT") {
return Ok(sdkroot);
let p = PathBuf::from(sdkroot);
let sdkroot = p.to_string_lossy();
match sdk {
// Ignore `SDKROOT` if it's clearly set for the wrong platform.
"appletvos"
if sdkroot.contains("TVSimulator.platform")
|| sdkroot.contains("MacOSX.platform") => {}
"appletvsimulator"
if sdkroot.contains("TVOS.platform") || sdkroot.contains("MacOSX.platform") => {
}
"iphoneos"
if sdkroot.contains("iPhoneSimulator.platform")
|| sdkroot.contains("MacOSX.platform") => {}
"iphonesimulator"
if sdkroot.contains("iPhoneOS.platform")
|| sdkroot.contains("MacOSX.platform") => {}
"macosx10.15"
if sdkroot.contains("iPhoneOS.platform")
|| sdkroot.contains("iPhoneSimulator.platform") => {}
"watchos"
if sdkroot.contains("WatchSimulator.platform")
|| sdkroot.contains("MacOSX.platform") => {}
"watchsimulator"
if sdkroot.contains("WatchOS.platform")
|| sdkroot.contains("MacOSX.platform") => {}
"xros"
if sdkroot.contains("XRSimulator.platform")
|| sdkroot.contains("MacOSX.platform") => {}
"xrsimulator"
if sdkroot.contains("XROS.platform") || sdkroot.contains("MacOSX.platform") => {
}
// Ignore `SDKROOT` if it's not a valid path.
_ if !p.is_absolute() || p == Path::new("/") || !p.exists() => {}
_ => return Ok(p.into()),
}
}

let mut cache = self
Expand Down
26 changes: 26 additions & 0 deletions tests/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,32 @@ fn clang_apple_visionos() {
test.cmd(0).must_not_have("-mxrsimulator-version-min=1.0");
}

#[cfg(target_os = "macos")]
#[test]
fn apple_sdkroot_wrong() {
let output = std::process::Command::new("xcrun")
.args(["--show-sdk-path", "--sdk", "iphoneos"])
.output()
.unwrap();
if !output.status.success() {
return;
}

let wrong_sdkroot = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk";
let test = Test::clang();
test.gcc()
.__set_env("SDKROOT", wrong_sdkroot)
.target("aarch64-apple-ios")
.file("foo.c")
.compile("foo");

dbg!(test.cmd(0).args);

test.cmd(0)
.must_have(std::str::from_utf8(&output.stdout).unwrap().trim());
test.cmd(0).must_not_have(wrong_sdkroot);
}

#[test]
fn compile_intermediates() {
let test = Test::gnu();
Expand Down