Replace periods with underscores as well when parsing env variables (#1541)

Author: datdenkikniet

src/lib.rs

@@ -114,8 +114,8 @@
 //! Each of these variables can also be supplied with certain prefixes and suffixes,
 //! in the following prioritized order:
 //!
-//!   1. `<var>_<target>` - for example, `CC_x86_64-unknown-linux-gnu`
-//!   2. `<var>_<target_with_underscores>` - for example, `CC_x86_64_unknown_linux_gnu`
+//!   1. `<var>_<target>` - for example, `CC_x86_64-unknown-linux-gnu` or `CC_thumbv8m.main-none-eabi`
+//!   2. `<var>_<target_with_underscores>` - for example, `CC_x86_64_unknown_linux_gnu` or `CC_thumbv8m_main_none_eabi` (both periods and underscores are replaced)
 //!   3. `<build-kind>_<var>` - for example, `HOST_CC` or `TARGET_CFLAGS`
 //!   4. `<var>` - a plain `CC`, `AR` as above.
 //!
@@ -3928,7 +3928,7 @@ impl Build {
         } else {
             "HOST"
         };
-        let target_u = target.replace('-', "_");
+        let target_u = target.replace(['-', '.'], "_");
 
         Ok([
             format!("{env}_{target}"),

tests/cc_env.rs

@@ -133,12 +133,14 @@ fn env_var_alternatives_override() {
     let compiler2 = format!("clang2{}", env::consts::EXE_SUFFIX);
     let compiler3 = format!("clang3{}", env::consts::EXE_SUFFIX);
     let compiler4 = format!("clang4{}", env::consts::EXE_SUFFIX);
+    let compiler5 = format!("clang5{}", env::consts::EXE_SUFFIX);
 
     let test = Test::new();
     test.shim(&compiler1);
     test.shim(&compiler2);
     test.shim(&compiler3);
     test.shim(&compiler4);
+    test.shim(&compiler5);
 
     env::set_var("CC", &compiler1);
     let compiler = test.gcc().target("x86_64-unknown-none").get_compiler();
@@ -156,4 +158,8 @@ fn env_var_alternatives_override() {
     env::set_var("CC_x86_64-unknown-none", &compiler4);
     let compiler = test.gcc().target("x86_64-unknown-none").get_compiler();
     assert_eq!(compiler.path(), Path::new(&compiler4));
+
+    env::set_var("CC_thumbv8m_main_none_eabi", &compiler5);
+    let compiler = test.gcc().target("thumbv8m.main-none-eabi").get_compiler();
+    assert_eq!(compiler.path(), Path::new(&compiler5));
 }