authorgravatar for xavierb@gmail.comXavier Bouchoux <xavierb@gmail.com> 2025-04-28 07:31:45+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-05-04 10:57:04+02:00
logbb79c85cb7ad591e0d8d4fe94b3c32883173c5fa
tree8abeae39da0f3d2779bf9d9a6b45a5d46c4d9c9c
parentdffd18f133972cb2e1b0695340f8104c3cd3b5f8

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

1 files changed, 4 insertions(+), 5 deletions(-)

src/main.zig+4-5
...@@ -4155,7 +4155,7 @@ fn createModule(...@@ -4155,7 +4155,7 @@ fn createModule(
4155 };4155 };
4156 }4156 }
41574157
4158 if (builtin.target.os.tag == .windows and (target.abi == .msvc or target.abi == .itanium) and4158 if (target.os.tag == .windows and (target.abi == .msvc or target.abi == .itanium) and
4159 any_name_queries_remaining)4159 any_name_queries_remaining)
4160 {4160 {
4161 if (create_module.libc_installation == null) {4161 if (create_module.libc_installation == null) {
...@@ -4166,11 +4166,10 @@ fn createModule(...@@ -4166,11 +4166,10 @@ fn createModule(
4166 }) catch |err| {4166 }) catch |err| {
4167 fatal("unable to find native libc installation: {s}", .{@errorName(err)});4167 fatal("unable to find native libc installation: {s}", .{@errorName(err)});
4168 };4168 };
4169
4170 try create_module.lib_directories.ensureUnusedCapacity(arena, 2);
4171 addLibDirectoryWarn(&create_module.lib_directories, create_module.libc_installation.?.msvc_lib_dir.?);
4172 addLibDirectoryWarn(&create_module.lib_directories, create_module.libc_installation.?.kernel32_lib_dir.?);
4173 }4169 }
4170 try create_module.lib_directories.ensureUnusedCapacity(arena, 2);
4171 addLibDirectoryWarn(&create_module.lib_directories, create_module.libc_installation.?.msvc_lib_dir.?);
4172 addLibDirectoryWarn(&create_module.lib_directories, create_module.libc_installation.?.kernel32_lib_dir.?);
4174 }4173 }
41754174
4176 // Destructively mutates but does not transfer ownership of `unresolved_link_inputs`.4175 // Destructively mutates but does not transfer ownership of `unresolved_link_inputs`.