user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #27653 - Keruspe:master, r=alexcrichton

Browse source
This commit is contained in:
bors 2015-08-22 03:45:14 +00:00
commit a03ec1a07a
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_back/target/mod.rs
View file

@ -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(),