We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 8adbb38 commit 19e97f5Copy full SHA for 19e97f5
src/librustc/back/archive.rs
@@ -37,7 +37,15 @@ pub struct ArchiveRO {
37
38
fn run_ar(sess: Session, args: &str, cwd: Option<&Path>,
39
paths: &[&Path]) -> ProcessOutput {
40
- let ar = sess.opts.ar.clone().unwrap_or_else(|| ~"ar");
+ let ar = if sess.opts.target_triple == ~"arm-linux-androideabi" {
41
+ match sess.opts.android_cross_path {
42
+ Some(ref path) => *path + "/bin/" + "arm-linux-androideabi-ar",
43
+ None => ~"arm-linux-androideabi-ar"
44
+ }
45
+ } else {
46
+ sess.opts.ar.clone().unwrap_or_else(|| ~"ar")
47
+ };
48
+
49
let mut args = ~[args.to_owned()];
50
let mut paths = paths.iter().map(|p| p.as_str().unwrap().to_owned());
51
args.extend(&mut paths);
0 commit comments