diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2024-11-28 14:07:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-28 14:07:28 +0100 |
| commit | 8594f179f9d70fbc3bf39111c4e1f147d4a6dc3c (patch) | |
| tree | 5221ffb639a15071af4c079d7dd75a8f2cf55497 /lib/std/Target | |
| parent | 6cf01a679f1950f1393d9245048a62500e3869c1 (diff) | |
| parent | 5beb5f20d282fd0db8715899ba6a5d6630d91bb4 (diff) | |
| download | zig-8594f179f9d70fbc3bf39111c4e1f147d4a6dc3c.tar.gz zig-8594f179f9d70fbc3bf39111c4e1f147d4a6dc3c.zip | |
Merge pull request #22067 from alexrp/pie-tests
Add PIC/PIE tests and fix some bugs + some improvements to the test harness
Diffstat (limited to 'lib/std/Target')
| -rw-r--r-- | lib/std/Target/Query.zig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/std/Target/Query.zig b/lib/std/Target/Query.zig index f3e280ee32..144b2d60af 100644 --- a/lib/std/Target/Query.zig +++ b/lib/std/Target/Query.zig @@ -102,7 +102,7 @@ pub fn fromTarget(target: Target) Query { .os_version_min = undefined, .os_version_max = undefined, .abi = target.abi, - .glibc_version = if (target.isGnuLibC()) target.os.version_range.linux.glibc else null, + .glibc_version = target.os.versionRange().gnuLibCVersion(), .android_api_level = if (target.abi.isAndroid()) target.os.version_range.linux.android else null, }; result.updateOsVersionRange(target.os); @@ -132,9 +132,9 @@ fn updateOsVersionRange(self: *Query, os: Target.Os) void { .{ .semver = os.version_range.semver.min }, .{ .semver = os.version_range.semver.max }, }, - .linux => .{ - .{ .semver = os.version_range.linux.range.min }, - .{ .semver = os.version_range.linux.range.max }, + inline .hurd, .linux => |t| .{ + .{ .semver = @field(os.version_range, @tagName(t)).range.min }, + .{ .semver = @field(os.version_range, @tagName(t)).range.max }, }, .windows => .{ .{ .windows = os.version_range.windows.min }, @@ -544,7 +544,7 @@ fn parseOs(result: *Query, diags: *ParseOptions.Diagnostics, text: []const u8) ! const version_text = it.rest(); if (version_text.len > 0) switch (tag.versionRangeTag()) { .none => return error.InvalidOperatingSystemVersion, - .semver, .linux => range: { + .semver, .hurd, .linux => range: { var range_it = mem.splitSequence(u8, version_text, "..."); result.os_version_min = .{ .semver = parseVersion(range_it.first()) catch |err| switch (err) { |