mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

librustc: move target dependent logic to back::link

Browse Source
This commit is contained in:
Young-il Choi 2013-12-27 17:29:53 +09:00
parent 19e97f5c5d
commit c8c99429d2
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustc/back/archive.rs
View File

@ -10,6 +10,7 @@
//! A helper class for dealing with static archives
use back::link::{get_ar_prog};
use driver::session::Session;
use metadata::filesearch;
use lib::llvm::{ArchiveRef, llvm};
@ -37,14 +38,7 @@ pub struct ArchiveRO {
fn run_ar(sess: Session, args: &str, cwd: Option<&Path>,
paths: &[&Path]) -> ProcessOutput {
let ar = if sess.opts.target_triple == ~"arm-linux-androideabi" {
match sess.opts.android_cross_path {
Some(ref path) => *path + "/bin/" + "arm-linux-androideabi-ar",
None => ~"arm-linux-androideabi-ar"
}
} else {
sess.opts.ar.clone().unwrap_or_else(|| ~"ar")
};
let ar = get_ar_prog(sess);
let mut args = ~[args.to_owned()];
let mut paths = paths.iter().map(|p| p.as_str().unwrap().to_owned());

16
src/librustc/back/link.rs
View File

@ -736,6 +736,22 @@ pub fn get_cc_prog(sess: Session) -> ~str {
}
}
pub fn get_ar_prog(sess: Session) -> ~str {
match sess.targ_cfg.os {
abi::OsAndroid => match sess.opts.android_cross_path {
Some(ref path) => format!("{}/bin/arm-linux-androideabi-ar", *path),
None => {
sess.fatal("need Android NDK path for linking \
(--android-cross-path)")
}
},
_ => match sess.opts.ar {
Some(ref ar) => format!("{}", *ar),
None => ~"ar"
},
}
}
/// Perform the linkage portion of the compilation phase. This will generate all
/// of the requested outputs for this compilation session.
pub fn link_binary(sess: Session,