Detect standalone android compiler with regex

Author: gianluca-hilton

Cargo.toml

@@ -19,6 +19,7 @@ edition = "2018"
 
 [dependencies]
 jobserver = { version = "0.1.16", optional = true }
+regex = "1.3.9"
 
 [features]
 parallel = ["jobserver"]

src/lib.rs

@@ -66,6 +66,7 @@ use std::path::{Path, PathBuf};
 use std::process::{Child, Command, Stdio};
 use std::sync::{Arc, Mutex};
 use std::thread::{self, JoinHandle};
+use regex::Regex;
 
 // These modules are all glue to support reading the MSVC version from
 // the registry and from COM interfaces
@@ -2839,9 +2840,18 @@ static NEW_STANDALONE_ANDROID_COMPILERS: [&str; 4] = [
 // So to construct proper command line check if
 // `--target` argument would be passed or not to clang
 fn android_clang_compiler_uses_target_arg_internally(clang_path: &Path) -> bool {
-    NEW_STANDALONE_ANDROID_COMPILERS
-        .iter()
-        .any(|x| Some(x.as_ref()) == clang_path.file_name())
+    let re = Regex::new(r"^.*\d{2}-clang(\+\+)?$").unwrap();
+    re.is_match(clang_path.to_str().unwrap())
+}
+
+#[test]
+fn test_android_clang_compiler_uses_target_arg_internally() {
+    for version in 16..21 {
+        assert!(android_clang_compiler_uses_target_arg_internally(&PathBuf::from(format!("armv7a-linux-androideabi{}-clang", version))));
+        assert!(android_clang_compiler_uses_target_arg_internally(&PathBuf::from(format!("armv7a-linux-androideabi{}-clang++", version))));    
+    }
+    assert!(!android_clang_compiler_uses_target_arg_internally(&PathBuf::from("clang")));
+    assert!(!android_clang_compiler_uses_target_arg_internally(&PathBuf::from("clang++")));
 }
 
 fn autodetect_android_compiler(target: &str, host: &str, gnu: &str, clang: &str) -> String {