diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2025-02-18 00:51:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-18 00:51:59 +0100 |
| commit | b732070fd36267fb055347e3aa8a1851e4054d50 (patch) | |
| tree | 9851eb03564eff472bbb4a605e13e4058baed4c6 /lib/std/Target/Query.zig | |
| parent | 55c46870b23ac16670beaa3ff1c082b703738307 (diff) | |
| parent | faccd79ca5debbe22fe168193b8de54393257604 (diff) | |
| download | zig-b732070fd36267fb055347e3aa8a1851e4054d50.tar.gz zig-b732070fd36267fb055347e3aa8a1851e4054d50.zip | |
Merge pull request #22589 from alexrp/target-changes
Some miscellaneous target and calling convention changes
Diffstat (limited to 'lib/std/Target/Query.zig')
| -rw-r--r-- | lib/std/Target/Query.zig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/std/Target/Query.zig b/lib/std/Target/Query.zig index 56387c27b3..2d5c734108 100644 --- a/lib/std/Target/Query.zig +++ b/lib/std/Target/Query.zig @@ -26,7 +26,7 @@ os_version_min: ?OsVersion = null, os_version_max: ?OsVersion = null, /// `null` means default when cross compiling, or native when `os_tag` is native. -/// If `isGnuLibC()` is `false`, this must be `null` and is ignored. +/// If `isGnu()` is `false`, this must be `null` and is ignored. glibc_version: ?SemanticVersion = null, /// `null` means default when cross compiling, or native when `os_tag` is native. @@ -235,8 +235,7 @@ pub fn parse(args: ParseOptions) !Query { const abi_ver_text = abi_it.rest(); if (abi_it.next() != null) { - const tag = result.os_tag orelse builtin.os.tag; - if (tag.isGnuLibC(abi)) { + if (abi.isGnu()) { result.glibc_version = parseVersion(abi_ver_text) catch |err| switch (err) { error.Overflow => return error.InvalidAbiVersion, error.InvalidVersion => return error.InvalidAbiVersion, |