X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fbootstrap%2Fcc_detect.rs;h=7795bebaed55f34506d2fe467729296c33983658;hb=6b8d9dd0a09851b3e4f400ddd1303857945be25d;hp=759a99c330c279d1aec9714b7eaae757908a315b;hpb=96737e3a52306192c23bf30b4108c568ec1f7701;p=rust.git

diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
index 759a99c330c..7795bebaed5 100644
--- a/src/bootstrap/cc_detect.rs
+++ b/src/bootstrap/cc_detect.rs
@@ -47,6 +47,8 @@ fn cc2ar(cc: &Path, target: TargetSelection) -> Option<PathBuf> {
         Some(PathBuf::from("ar"))
     } else if target.contains("vxworks") {
         Some(PathBuf::from("wr-ar"))
+    } else if target.contains("android") {
+        Some(cc.parent().unwrap().join(PathBuf::from("llvm-ar")))
     } else {
         let parent = cc.parent().unwrap();
         let file = cc.file_name().unwrap().to_str().unwrap();
@@ -166,13 +168,22 @@ fn set_compiler(
         // compiler already takes into account the triple in question.
         t if t.contains("android") => {
             if let Some(ndk) = config.and_then(|c| c.ndk.as_ref()) {
-                let target = target
-                    .triple
-                    .replace("armv7neon", "arm")
-                    .replace("armv7", "arm")
-                    .replace("thumbv7neon", "arm")
-                    .replace("thumbv7", "arm");
-                let compiler = format!("{}-{}", target, compiler.clang());
+                let mut triple_iter = target.triple.split("-");
+                let triple_translated = if let Some(arch) = triple_iter.next() {
+                    let arch_new = match arch {
+                        "arm" | "armv7" | "armv7neon" | "thumbv7" | "thumbv7neon" => "armv7a",
+                        other => other,
+                    };
+                    std::iter::once(arch_new).chain(triple_iter).collect::<Vec<&str>>().join("-")
+                } else {
+                    target.triple.to_string()
+                };
+
+                // API 19 is the earliest API level supported by NDK r25b but AArch64 and x86_64 support
+                // begins at API level 21.
+                let api_level =
+                    if t.contains("aarch64") || t.contains("x86_64") { "21" } else { "19" };
+                let compiler = format!("{}{}-{}", triple_translated, api_level, compiler.clang());
                 cfg.compiler(ndk.join("bin").join(compiler));
             }
         }