authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-12-04 20:46:26-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-01 17:51:18-07:00
logce94c28e53e706e506d4c95c25c8bf99e7a597eb
treee2ef71ccf5c03a90be69958b5cc0775dba307ac9
parent3e52302644e29fec3917385f2b998f53941f8376

resinator: update std.Target.Query usage

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

src/main.zig+10-4
...@@ -4664,8 +4664,11 @@ fn detectRcIncludeDirs(arena: Allocator, zig_lib_dir: []const u8, auto_includes:...@@ -4664,8 +4664,11 @@ fn detectRcIncludeDirs(arena: Allocator, zig_lib_dir: []const u8, auto_includes:
4664 while (true) {4664 while (true) {
4665 switch (cur_includes) {4665 switch (cur_includes) {
4666 .any, .msvc => {4666 .any, .msvc => {
4667 const target_query = std.Target.Query.parse(.{ .arch_os_abi = "native-windows-msvc" }) catch unreachable;4667 const target_query: std.Target.Query = .{
4668 const target = target_query.toTarget();4668 .os_tag = .windows,
4669 .abi = .msvc,
4670 };
4671 const target = try std.zig.system.resolveTargetQuery(target_query);
4669 const is_native_abi = target_query.isNativeAbi();4672 const is_native_abi = target_query.isNativeAbi();
4670 const detected_libc = Compilation.detectLibCIncludeDirs(arena, zig_lib_dir, target, is_native_abi, true, null) catch |err| {4673 const detected_libc = Compilation.detectLibCIncludeDirs(arena, zig_lib_dir, target, is_native_abi, true, null) catch |err| {
4671 if (cur_includes == .any) {4674 if (cur_includes == .any) {
...@@ -4689,8 +4692,11 @@ fn detectRcIncludeDirs(arena: Allocator, zig_lib_dir: []const u8, auto_includes:...@@ -4689,8 +4692,11 @@ fn detectRcIncludeDirs(arena: Allocator, zig_lib_dir: []const u8, auto_includes:
4689 };4692 };
4690 },4693 },
4691 .gnu => {4694 .gnu => {
4692 const target_query = std.Target.Query.parse(.{ .arch_os_abi = "native-windows-gnu" }) catch unreachable;4695 const target_query: std.Target.Query = .{
4693 const target = target_query.toTarget();4696 .os_tag = .windows,
4697 .abi = .gnu,
4698 };
4699 const target = try std.zig.system.resolveTargetQuery(target_query);
4694 const is_native_abi = target_query.isNativeAbi();4700 const is_native_abi = target_query.isNativeAbi();
4695 const detected_libc = try Compilation.detectLibCIncludeDirs(arena, zig_lib_dir, target, is_native_abi, true, null);4701 const detected_libc = try Compilation.detectLibCIncludeDirs(arena, zig_lib_dir, target, is_native_abi, true, null);
4696 return .{4702 return .{