mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-02 11:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

resinator: update std.Target.Query usage

Browse Source
This commit is contained in:
Andrew Kelley 2023-12-04 20:46:26 -07:00
parent 3e52302644
commit ce94c28e53
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.zig
View File

@ -4664,8 +4664,11 @@ fn detectRcIncludeDirs(arena: Allocator, zig_lib_dir: []const u8, auto_includes:
while (true) {
switch (cur_includes) {
.any, .msvc => {
const target_query = std.Target.Query.parse(.{ .arch_os_abi = "native-windows-msvc" }) catch unreachable;
const target = target_query.toTarget();
const target_query: std.Target.Query = .{
.os_tag = .windows,
.abi = .msvc,
};
const target = try std.zig.system.resolveTargetQuery(target_query);
const is_native_abi = target_query.isNativeAbi();
const detected_libc = Compilation.detectLibCIncludeDirs(arena, zig_lib_dir, target, is_native_abi, true, null) catch |err| {
if (cur_includes == .any) {
@ -4689,8 +4692,11 @@ fn detectRcIncludeDirs(arena: Allocator, zig_lib_dir: []const u8, auto_includes:
};
},
.gnu => {
const target_query = std.Target.Query.parse(.{ .arch_os_abi = "native-windows-gnu" }) catch unreachable;
const target = target_query.toTarget();
const target_query: std.Target.Query = .{
.os_tag = .windows,
.abi = .gnu,
};
const target = try std.zig.system.resolveTargetQuery(target_query);
const is_native_abi = target_query.isNativeAbi();
const detected_libc = try Compilation.detectLibCIncludeDirs(arena, zig_lib_dir, target, is_native_abi, true, null);
return .{