Skip to content

Commit 385c844

Browse files
tamirdtamird
committed
Use the linker directly on darwin,ios
Some logic to deal with macOS < 10.8 cribbed from: https://github.com/llvm-mirror/clang/blob/64309d1/lib/Driver/ToolChains/Darwin.cpp#L1910 Updates #11937.
1 parent c30d8f2 commit 385c844

File tree

11 files changed

+74
-51
lines changed

11 files changed

+74
-51
lines changed

‎src/librustc_back/target/aarch64_apple_ios.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn target() -> TargetResult {
2424
target_os: "ios".to_string(),
2525
target_env: "".to_string(),
2626
target_vendor: "apple".to_string(),
27-
linker_flavor: LinkerFlavor::Gcc,
27+
linker_flavor: LinkerFlavor::Ld,
2828
options: TargetOptions {
2929
features: "+neon,+fp-armv8,+cyclone".to_string(),
3030
eliminate_frame_pointer: false,

‎src/librustc_back/target/apple_base.rs‎

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,43 @@
99
// except according to those terms.
1010

1111
use std::env;
12+
use std::io;
13+
use std::process::Command;
14+
use std::str;
1215

13-
use target::{LinkArgs, TargetOptions};
16+
use target::TargetOptions;
17+
18+
pub fn xcrun(print_arg: &str, sdk_name: &str) -> io::Result<String> {
19+
Command::new("xcrun").arg(print_arg).arg("--sdk").arg(sdk_name).output().and_then(|output| {
20+
if output.status.success() {
21+
Ok(str::from_utf8(&output.stdout[..]).unwrap().trim().to_string())
22+
} else {
23+
let error = format!(
24+
"process exit with error: {}",
25+
str::from_utf8(&output.stderr[..]).unwrap(),
26+
);
27+
Err(io::Error::new(io::ErrorKind::Other, &error[..]))
28+
}
29+
})
30+
}
31+
32+
pub fn get_sdk_root(sdk_name: &str) -> Result<String, String> {
33+
xcrun("--show-sdk-path", sdk_name).map_err(|e| {
34+
format!("failed to get {} SDK path: {}", sdk_name, e)
35+
})
36+
}
37+
38+
pub fn get_sdk_version(sdk_name: &str) -> Result<String, String> {
39+
xcrun("--show-sdk-version", sdk_name).map_err(|e| {
40+
format!("failed to get {} SDK version: {}", sdk_name, e)
41+
})
42+
}
43+
44+
pub fn get_deployment_target() -> String {
45+
env::var("MACOSX_DEPLOYMENT_TARGET").or_else(|_e| {
46+
get_sdk_version("macosx")
47+
}).unwrap_or("10.7".to_string())
48+
}
1449

1550
pub fn opts() -> TargetOptions {
1651
// ELF TLS is only available in macOS 10.7+. If you try to compile for 10.6
@@ -22,15 +57,11 @@ pub fn opts() -> TargetOptions {
2257
// MACOSX_DEPLOYMENT_TARGET set to 10.6 will cause the linker to generate
2358
// warnings about the usage of ELF TLS.
2459
//
25-
// Here we detect what version is being requested, defaulting to 10.7. ELF
26-
// TLS is flagged as enabled if it looks to be supported.
27-
let deployment_target = env::var("MACOSX_DEPLOYMENT_TARGET").ok();
28-
let version = deployment_target.as_ref().and_then(|s| {
29-
let mut i = s.splitn(2, ".");
30-
i.next().and_then(|a| i.next().map(|b| (a, b)))
31-
}).and_then(|(a, b)| {
32-
a.parse::<u32>().and_then(|a| b.parse::<u32>().map(|b| (a, b))).ok()
33-
}).unwrap_or((10, 7));
60+
// Here we detect what version is being requested. ELF TLS is flagged as
61+
// enabled if it looks to be supported.
62+
let deployment_target = get_deployment_target();
63+
let mut i = deployment_target.splitn(2, '.').map(|s| s.parse::<u32>().unwrap());
64+
let version = (i.next().unwrap(), i.next().unwrap());
3465

3566
TargetOptions {
3667
// macOS has -dead_strip, which doesn't rely on function_sections
@@ -43,9 +74,9 @@ pub fn opts() -> TargetOptions {
4374
dll_prefix: "lib".to_string(),
4475
dll_suffix: ".dylib".to_string(),
4576
archive_format: "bsd".to_string(),
46-
pre_link_args: LinkArgs::new(),
4777
exe_allocation_crate: super::maybe_jemalloc(),
4878
has_elf_tls: version >= (10, 7),
79+
linker: "ld".to_string(),
4980
.. Default::default()
5081
}
5182
}

‎src/librustc_back/target/apple_ios_base.rs‎

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
// except according to those terms.
1010

1111
use LinkerFlavor;
12-
use std::io;
13-
use std::process::Command;
1412
use target::{LinkArgs, TargetOptions};
1513

1614
use self::Arch::*;
@@ -37,30 +35,6 @@ impl Arch {
3735
}
3836
}
3937

40-
pub fn get_sdk_root(sdk_name: &str) -> Result<String, String> {
41-
let res = Command::new("xcrun")
42-
.arg("--show-sdk-path")
43-
.arg("-sdk")
44-
.arg(sdk_name)
45-
.output()
46-
.and_then(|output| {
47-
if output.status.success() {
48-
Ok(String::from_utf8(output.stdout).unwrap())
49-
} else {
50-
let error = String::from_utf8(output.stderr);
51-
let error = format!("process exit with error: {}",
52-
error.unwrap());
53-
Err(io::Error::new(io::ErrorKind::Other,
54-
&error[..]))
55-
}
56-
});
57-
58-
match res {
59-
Ok(output) => Ok(output.trim().to_string()),
60-
Err(e) => Err(format!("failed to get {} SDK path: {}", sdk_name, e))
61-
}
62-
}
63-
6438
fn build_pre_link_args(arch: Arch) -> Result<LinkArgs, String> {
6539
let sdk_name = match arch {
6640
Armv7 | Armv7s | Arm64 => "iphoneos",
@@ -69,13 +43,13 @@ fn build_pre_link_args(arch: Arch) -> Result<LinkArgs, String> {
6943

7044
let arch_name = arch.to_string();
7145

72-
let sdk_root = get_sdk_root(sdk_name)?;
46+
let sdk_root = super::apple_base::get_sdk_root(sdk_name)?;
7347

7448
let mut args = LinkArgs::new();
75-
args.insert(LinkerFlavor::Gcc,
49+
args.insert(LinkerFlavor::Ld,
7650
vec!["-arch".to_string(),
7751
arch_name.to_string(),
78-
"-Wl,-syslibroot".to_string(),
52+
"-syslibroot".to_string(),
7953
sdk_root]);
8054

8155
Ok(args)

‎src/librustc_back/target/armv7_apple_ios.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn target() -> TargetResult {
2424
target_os: "ios".to_string(),
2525
target_env: "".to_string(),
2626
target_vendor: "apple".to_string(),
27-
linker_flavor: LinkerFlavor::Gcc,
27+
linker_flavor: LinkerFlavor::Ld,
2828
options: TargetOptions {
2929
features: "+v7,+vfp3,+neon".to_string(),
3030
max_atomic_width: Some(64),

‎src/librustc_back/target/armv7s_apple_ios.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn target() -> TargetResult {
2424
target_os: "ios".to_string(),
2525
target_env: "".to_string(),
2626
target_vendor: "apple".to_string(),
27-
linker_flavor: LinkerFlavor::Gcc,
27+
linker_flavor: LinkerFlavor::Ld,
2828
options: TargetOptions {
2929
features: "+v7,+vfp4,+neon".to_string(),
3030
max_atomic_width: Some(64),

‎src/librustc_back/target/i386_apple_ios.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn target() -> TargetResult {
2424
target_os: "ios".to_string(),
2525
target_env: "".to_string(),
2626
target_vendor: "apple".to_string(),
27-
linker_flavor: LinkerFlavor::Gcc,
27+
linker_flavor: LinkerFlavor::Ld,
2828
options: TargetOptions {
2929
max_atomic_width: Some(64),
3030
stack_probes: true,

‎src/librustc_back/target/i686_apple_darwin.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ pub fn target() -> TargetResult {
1515
let mut base = super::apple_base::opts();
1616
base.cpu = "yonah".to_string();
1717
base.max_atomic_width = Some(64);
18-
base.pre_link_args.insert(LinkerFlavor::Gcc, vec!["-m32".to_string()]);
1918
base.stack_probes = true;
2019

2120
Ok(Target {
@@ -28,7 +27,7 @@ pub fn target() -> TargetResult {
2827
target_os: "macos".to_string(),
2928
target_env: "".to_string(),
3029
target_vendor: "apple".to_string(),
31-
linker_flavor: LinkerFlavor::Gcc,
30+
linker_flavor: LinkerFlavor::Ld,
3231
options: base,
3332
})
3433
}

‎src/librustc_back/target/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ use syntax::abi::{Abi, lookup as lookup_abi};
5353
use {LinkerFlavor, PanicStrategy, RelroLevel};
5454

5555
mod android_base;
56-
mod apple_base;
56+
pub mod apple_base;
5757
mod apple_ios_base;
5858
mod arm_base;
5959
mod bitrig_base;

‎src/librustc_back/target/x86_64_apple_darwin.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ pub fn target() -> TargetResult {
1616
base.cpu = "core2".to_string();
1717
base.max_atomic_width = Some(128); // core2 support cmpxchg16b
1818
base.eliminate_frame_pointer = false;
19-
base.pre_link_args.insert(LinkerFlavor::Gcc, vec!["-m64".to_string()]);
2019
base.stack_probes = true;
2120

2221
Ok(Target {
@@ -29,7 +28,7 @@ pub fn target() -> TargetResult {
2928
target_os: "macos".to_string(),
3029
target_env: "".to_string(),
3130
target_vendor: "apple".to_string(),
32-
linker_flavor: LinkerFlavor::Gcc,
31+
linker_flavor: LinkerFlavor::Ld,
3332
options: base,
3433
})
3534
}

‎src/librustc_back/target/x86_64_apple_ios.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn target() -> TargetResult {
2424
target_os: "ios".to_string(),
2525
target_env: "".to_string(),
2626
target_vendor: "apple".to_string(),
27-
linker_flavor: LinkerFlavor::Gcc,
27+
linker_flavor: LinkerFlavor::Ld,
2828
options: TargetOptions {
2929
max_atomic_width: Some(64),
3030
stack_probes: true,

0 commit comments

Comments
 (0)