about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-17 08:54:15 +0000
committerbors <bors@rust-lang.org>2018-12-17 08:54:15 +0000
commita23d5ed751d14c00239ccedda7a4a732d4ffd900 (patch)
treeed1fd55dad968a601cb40ca9de275f2f37081b31
parent7fb479c92b6358590a0180b00a416bb055b6548e (diff)
parent313a9c7090522872ef95cf3e573e9a00b9e7a97b (diff)
downloadrust-a23d5ed751d14c00239ccedda7a4a732d4ffd900.tar.gz
rust-a23d5ed751d14c00239ccedda7a4a732d4ffd900.zip
Auto merge of #56833 - nagisa:ios-fix, r=alexcrichton
Provide -isysroot with sdkroot for ios builds

Necessary for the new XCode?

Absolutely positively definitely untested… although I did

```
cargo rustc -- -Clink-arg=-isysroot -Clink-arg=$sdk_root
```

and stuff did compile for once.
-rw-r--r--src/librustc_target/spec/apple_ios_base.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/librustc_target/spec/apple_ios_base.rs b/src/librustc_target/spec/apple_ios_base.rs
index e926e4913d6..ef41ea31e3e 100644
--- a/src/librustc_target/spec/apple_ios_base.rs
+++ b/src/librustc_target/spec/apple_ios_base.rs
@@ -74,6 +74,8 @@ fn build_pre_link_args(arch: Arch) -> Result<LinkArgs, String> {
     args.insert(LinkerFlavor::Gcc,
                 vec!["-arch".to_string(),
                      arch_name.to_string(),
+                     "-isysroot".to_string(),
+                     sdk_root.clone(),
                      "-Wl,-syslibroot".to_string(),
                      sdk_root]);