fix targets with zig toolchain

rust-lang · Mar 22, 2024 · b344e8e · b344e8e
1 parent bbae474
commit b344e8e
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1902,7 +1902,14 @@ impl Build {
 
         // Target flags
         match cmd.family {
-            ToolFamily::Clang { .. } => {
+            ToolFamily::Clang { zig_cc } => {
+                let target = if zig_cc {
+                    Cow::Owned(target.replace("-unknown-", "-"))
+                } else {
+                    Cow::Borrowed(target)
+                };
+                let target = target.as_ref();
+
                 if !cmd.has_internal_target_arg
                     && !(target.contains("android")
                         && android_clang_compiler_uses_target_arg_internally(&cmd.path))
@@ -1998,7 +2005,7 @@ impl Build {
                             );
                         }
                     } else if let Ok(index) = target_info::RISCV_ARCH_MAPPING
-                        .binary_search_by_key(&arch, |(arch, _)| &arch)
+                        .binary_search_by_key(&arch, |(arch, _)| arch)
                     {
                         cmd.args.push(
                             format!(