mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 05:44:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

std.Target.Query: fix WindowsVersion format in zigTriple()

Browse source
This commit is contained in:
KNnut 2025-08-04 23:07:49 +08:00 • committed by Alex Rønne Petersen
parent 96be6f6566
commit fcb088cb6a
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/std/Target/Query.zig
View file

@ -423,7 +423,7 @@ pub fn zigTriple(self: Query, gpa: Allocator) Allocator.Error![]u8 {
try formatVersion(v, gpa, &result);
},
.windows => |v| {
try result.print(gpa, "{d}", .{v});
try result.print(gpa, "{f}", .{v});
},
}
}
@ -437,7 +437,7 @@ pub fn zigTriple(self: Query, gpa: Allocator) Allocator.Error![]u8 {
.windows => |v| {
// This is counting on a custom format() function defined on `WindowsVersion`
// to add a prefix '.' and make there be a total of three dots.
try result.print(gpa, "..{d}", .{v});
try result.print(gpa, "..{f}", .{v});
},
}
}
@ -729,4 +729,20 @@ test parse {
defer std.testing.allocator.free(text);
try std.testing.expectEqualSlices(u8, "aarch64-linux.3.10...4.4.1-android.30", text);
}
{
const query = try Query.parse(.{
.arch_os_abi = "x86-windows.xp...win8-msvc",
});
const target = try std.zig.system.resolveTargetQuery(query);
try std.testing.expect(target.cpu.arch == .x86);
try std.testing.expect(target.os.tag == .windows);
try std.testing.expect(target.os.version_range.windows.min == .xp);
try std.testing.expect(target.os.version_range.windows.max == .win8);
try std.testing.expect(target.abi == .msvc);
const text = try query.zigTriple(std.testing.allocator);
defer std.testing.allocator.free(text);
try std.testing.expectEqualSlices(u8, "x86-windows.xp...win8-msvc", text);
}
}