mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Xavier Bouchoux 2025-04-28 07:31:45 +02:00 committed by Alex Rønne Petersen
parent dffd18f133
commit bb79c85cb7
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.zig
View File

@ -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`.