motiejus/zig

commit 3dcbd489eba48107443a514e5470e1a58d6691d9 (tree)
parent 5582d20f044c6891038d20d6057c61a3df829714
Author: Martin Wickham <spexguy070@gmail.com>
Date:   Sat, 10 Jul 2021 15:55:38 -0500

Fix libc include directories for the MSVC target

Diffstat:
M
src/Compilation.zig
 | 
9
++++++++-

1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/Compilation.zig b/src/Compilation.zig
@@ -3295,7 +3295,14 @@ fn detectLibCIncludeDirs(
 
     // If zig can't build the libc for the target and we are targeting the
     // native abi, fall back to using the system libc installation.
-    if (is_native_abi) {
+    // On windows, instead of the native (mingw) abi, we want to check
+    // for the MSVC abi as a fallback.
+    const use_system_abi = if (std.Target.current.os.tag == .windows)
+        target.abi == .msvc
+    else
+        is_native_abi;
+
+    if (use_system_abi) {
         const libc = try arena.create(LibCInstallation);
         libc.* = try LibCInstallation.findNative(.{ .allocator = arena, .verbose = true });
         return detectLibCFromLibCInstallation(arena, target, libc);