diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2021-11-26 01:08:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-26 01:08:16 +0100 |
| commit | 2006add8496c47804ee3b6c562f420871cb4ea0a (patch) | |
| tree | 35a99f3a77d353a725599812a84b82d6449d796f /lib/std/target.zig | |
| parent | 9177f5c17b8dfe55b2aa0be1588bd1a4409386d1 (diff) | |
| parent | a0414012568028cd26a118c47be58940e10e2d95 (diff) | |
| download | zig-2006add8496c47804ee3b6c562f420871cb4ea0a.tar.gz zig-2006add8496c47804ee3b6c562f420871cb4ea0a.zip | |
Merge pull request #10215 from ziglang/macos-versions
Ship versioned libc headers on macOS
Diffstat (limited to 'lib/std/target.zig')
| -rw-r--r-- | lib/std/target.zig | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/lib/std/target.zig b/lib/std/target.zig index 138f4cebe9..3113159995 100644 --- a/lib/std/target.zig +++ b/lib/std/target.zig @@ -81,10 +81,10 @@ pub const Target = struct { } } - pub fn defaultVersionRange(tag: Tag) Os { + pub fn defaultVersionRange(tag: Tag, arch: Cpu.Arch) Os { return .{ .tag = tag, - .version_range = VersionRange.default(tag), + .version_range = VersionRange.default(tag, arch), }; } }; @@ -226,7 +226,7 @@ pub const Target = struct { /// The default `VersionRange` represents the range that the Zig Standard Library /// bases its abstractions on. - pub fn default(tag: Tag) VersionRange { + pub fn default(tag: Tag, arch: Cpu.Arch) VersionRange { switch (tag) { .freestanding, .ananas, @@ -266,12 +266,22 @@ pub const Target = struct { .max = .{ .major = 13, .minor = 0 }, }, }, - .macos => return .{ - .semver = .{ - .min = .{ .major = 10, .minor = 13 }, - .max = .{ .major = 11, .minor = 2 }, + .macos => return switch (arch) { + .aarch64 => VersionRange{ + .semver = .{ + .min = .{ .major = 11, .minor = 6 }, + .max = .{ .major = 12, .minor = 0 }, + }, }, + .x86_64 => VersionRange{ + .semver = .{ + .min = .{ .major = 10, .minor = 13 }, + .max = .{ .major = 12, .minor = 0 }, + }, + }, + else => unreachable, }, + .ios => return .{ .semver = .{ .min = .{ .major = 12, .minor = 0 }, |