Try filter out libcompiler_builtins for Windows gnu targets

rust-cross · Nov 1, 2022 · 7863321 · 7863321
1 parent 718fa60
commit 7863321
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/zig.rs b/src/zig.rs
@@ -86,7 +86,10 @@ impl Zig {
                 // Replace libgcc_s with libunwind
                 return Some("-lunwind".to_string());
             }
-            if is_arm && arg.ends_with(".rlib") && arg.contains("libcompiler_builtins-") {
+            if (is_arm || is_windows_gnu)
+                && arg.ends_with(".rlib")
+                && arg.contains("libcompiler_builtins-")
+            {
                 // compiler-builtins is duplicated with zig's compiler-rt
                 return None;
             }