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 02:52:33+02:00
log7b45bd3c09e04edbd5bdd8a443e0ae3757b1a709
tree2e6904367db8cd1281c23bf339879f2504a56f49
parente07d8fccd1389f4d9da4f5d906c8349d3014add8
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

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

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

src/main.zig+4-5
...@@ -4058,7 +4058,7 @@ fn createModule(...@@ -4058,7 +4058,7 @@ fn createModule(
4058 };4058 };
4059 }4059 }
40604060
4061 if (builtin.target.os.tag == .windows and (target.abi == .msvc or target.abi == .itanium) and4061 if (target.os.tag == .windows and (target.abi == .msvc or target.abi == .itanium) and
4062 any_name_queries_remaining)4062 any_name_queries_remaining)
4063 {4063 {
4064 if (create_module.libc_installation == null) {4064 if (create_module.libc_installation == null) {
...@@ -4069,11 +4069,10 @@ fn createModule(...@@ -4069,11 +4069,10 @@ fn createModule(
4069 }) catch |err| {4069 }) catch |err| {
4070 fatal("unable to find native libc installation: {s}", .{@errorName(err)});4070 fatal("unable to find native libc installation: {s}", .{@errorName(err)});
4071 };4071 };
4072
4073 try create_module.lib_directories.ensureUnusedCapacity(arena, 2);
4074 addLibDirectoryWarn(&create_module.lib_directories, create_module.libc_installation.?.msvc_lib_dir.?);
4075 addLibDirectoryWarn(&create_module.lib_directories, create_module.libc_installation.?.kernel32_lib_dir.?);
4076 }4072 }
4073 try create_module.lib_directories.ensureUnusedCapacity(arena, 2);
4074 addLibDirectoryWarn(&create_module.lib_directories, create_module.libc_installation.?.msvc_lib_dir.?);
4075 addLibDirectoryWarn(&create_module.lib_directories, create_module.libc_installation.?.kernel32_lib_dir.?);
4077 }4076 }
40784077
4079 // Destructively mutates but does not transfer ownership of `unresolved_link_inputs`.4078 // Destructively mutates but does not transfer ownership of `unresolved_link_inputs`.