zig

commit 7b45bd3c09e04edbd5bdd8a443e0ae3757b1a709 (tree)
parent e07d8fccd1389f4d9da4f5d906c8349d3014add8
Author: Xavier Bouchoux <xavierb@gmail.com>
Date:   Mon, 28 Apr 2025 07:31:45 +0200

fix system library lookup when cross-compiling to windows-msvc

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

1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main.zig b/src/main.zig
@@ -4058,7 +4058,7 @@ fn createModule(
             };
         }
 
-        if (builtin.target.os.tag == .windows and (target.abi == .msvc or target.abi == .itanium) and
+        if (target.os.tag == .windows and (target.abi == .msvc or target.abi == .itanium) and
             any_name_queries_remaining)
         {
             if (create_module.libc_installation == null) {
@@ -4069,11 +4069,10 @@ fn createModule(
                 }) catch |err| {
                     fatal("unable to find native libc installation: {s}", .{@errorName(err)});
                 };
-
-                try create_module.lib_directories.ensureUnusedCapacity(arena, 2);
-                addLibDirectoryWarn(&create_module.lib_directories, create_module.libc_installation.?.msvc_lib_dir.?);
-                addLibDirectoryWarn(&create_module.lib_directories, create_module.libc_installation.?.kernel32_lib_dir.?);
             }
+            try create_module.lib_directories.ensureUnusedCapacity(arena, 2);
+            addLibDirectoryWarn(&create_module.lib_directories, create_module.libc_installation.?.msvc_lib_dir.?);
+            addLibDirectoryWarn(&create_module.lib_directories, create_module.libc_installation.?.kernel32_lib_dir.?);
         }
 
         // Destructively mutates but does not transfer ownership of `unresolved_link_inputs`.