diff options
| author | bors <bors@rust-lang.org> | 2015-08-22 03:45:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-08-22 03:45:14 +0000 |
| commit | a03ec1a07a1f8d32d6f6a1d57ba1012fb3c8cd79 (patch) | |
| tree | 5b220585fc7942a3185d5939019b934e8faaacd4 /src | |
| parent | 8f1b0aa32552f2e694aa8702ff2cd6d9a0e894f1 (diff) | |
| parent | c97759699264c6b1fa0e88420cd3c720df25e594 (diff) | |
Auto merge of #27653 - Keruspe:master, r=alexcrichton
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_back/target/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index d9cfdaacc90..542791ae904 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -185,8 +185,8 @@ impl Default for TargetOptions { fn default() -> TargetOptions { TargetOptions { data_layout: String::new(), - linker: "cc".to_string(), - ar: "ar".to_string(), + linker: option_env!("CFG_DEFAULT_LINKER").unwrap_or("cc").to_string(), + ar: option_env!("CFG_DEFAULT_AR").unwrap_or("ar").to_string(), pre_link_args: Vec::new(), post_link_args: Vec::new(), cpu: "generic".to_string(), |