From 2805415b7a3c49fc300bb7d0c183c8534d620794 Mon Sep 17 00:00:00 2001
From: Henri Sivonen <hsivonen@hsivonen.fi>
Date: Fri, 7 Sep 2018 13:23:57 +0300
Subject: [PATCH] Search for thumbv7neon before thumbv7 and armv7neon before
 armv7 when replacing to avoid unwanted substring matches.

---
 src/lib.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 4961fa5..61d8521 100644
--- 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