diff options
| author | Xavier Bouchoux <xavierb@gmail.com> | 2025-04-28 07:31:45 +0200 |
|---|---|---|
| committer | Alex Rønne Petersen <alex@alexrp.com> | 2025-05-04 10:57:04 +0200 |
| commit | bb79c85cb7ad591e0d8d4fe94b3c32883173c5fa (patch) | |
| tree | 8abeae39da0f3d2779bf9d9a6b45a5d46c4d9c9c /src/main.zig | |
| parent | dffd18f133972cb2e1b0695340f8104c3cd3b5f8 (diff) | |
| download | zig-bb79c85cb7ad591e0d8d4fe94b3c32883173c5fa.tar.gz zig-bb79c85cb7ad591e0d8d4fe94b3c32883173c5fa.zip | |
fix system library lookup when cross-compiling to windows-msvc
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main.zig b/src/main.zig index 7eb5436ee5..7a0e9c87a0 100644 --- a/src/main.zig +++ b/src/main.zig @@ -4155,7 +4155,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) { @@ -4166,11 +4166,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`. |