Search for thumbv7neon before thumbv7 and armv7neon before armv7 when replacing to avoid unwanted substring matches.

6 years ago · 2805415b7a
1 changed files with 3 additions and 3 deletions
--- a/src/lib.rs
+++ b/src/lib.rs
@ -1649,10 +1649,10 @@ impl Build {
                    }
                } else if target.contains("android") {
                    let target = target
-                        .replace("armv7", "arm")
                        .replace("armv7neon", "arm")
-                        .replace("thumbv7", "arm")
-                        .replace("thumbv7neon", "arm");
+                        .replace("armv7", "arm")
+                        .replace("thumbv7neon", "arm")
+                        .replace("thumbv7", "arm");
                    let gnu_compiler = format!("{}-{}", target, gnu);
                    let clang_compiler = format!("{}-{}", target, clang);
                    // Check if gnu compiler is present