diff options
| author | Michael Dusan <michael.dusan@gmail.com> | 2023-09-15 01:05:14 -0400 |
|---|---|---|
| committer | Michael Dusan <michael.dusan@gmail.com> | 2023-09-25 15:53:05 -0400 |
| commit | 15fd7cd154316e7eb3bf254e249072e562fdbe2c (patch) | |
| tree | 7ebf55a244fdb21b1739b30e4dfeec073d86b3f4 /src/target.zig | |
| parent | 52e835492626b34b34a46115f953591e01d1088e (diff) | |
| download | zig-15fd7cd154316e7eb3bf254e249072e562fdbe2c.tar.gz zig-15fd7cd154316e7eb3bf254e249072e562fdbe2c.zip | |
macos: vendored libc: combine headers: part 2
- update include dirs to use combined dir
- use one libSystem.tbd (drop use of libSystem.VERSION.tbd)
- update canBuildLibC to check for minimum os version only
Diffstat (limited to 'src/target.zig')
| -rw-r--r-- | src/target.zig | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/target.zig b/src/target.zig index 5e5cf95614..e6e206845f 100644 --- a/src/target.zig +++ b/src/target.zig @@ -18,8 +18,6 @@ pub const available_libcs = [_]ArchOsAbi{ .{ .arch = .aarch64, .os = .linux, .abi = .musl }, .{ .arch = .aarch64, .os = .windows, .abi = .gnu }, .{ .arch = .aarch64, .os = .macos, .abi = .none, .os_ver = .{ .major = 11, .minor = 0, .patch = 0 } }, - .{ .arch = .aarch64, .os = .macos, .abi = .none, .os_ver = .{ .major = 12, .minor = 0, .patch = 0 } }, - .{ .arch = .aarch64, .os = .macos, .abi = .none, .os_ver = .{ .major = 13, .minor = 0, .patch = 0 } }, .{ .arch = .armeb, .os = .linux, .abi = .gnueabi }, .{ .arch = .armeb, .os = .linux, .abi = .gnueabihf }, .{ .arch = .armeb, .os = .linux, .abi = .musleabi }, @@ -72,9 +70,7 @@ pub const available_libcs = [_]ArchOsAbi{ .{ .arch = .x86_64, .os = .linux, .abi = .gnux32 }, .{ .arch = .x86_64, .os = .linux, .abi = .musl }, .{ .arch = .x86_64, .os = .windows, .abi = .gnu }, - .{ .arch = .x86_64, .os = .macos, .abi = .none, .os_ver = .{ .major = 11, .minor = 0, .patch = 0 } }, - .{ .arch = .x86_64, .os = .macos, .abi = .none, .os_ver = .{ .major = 12, .minor = 0, .patch = 0 } }, - .{ .arch = .x86_64, .os = .macos, .abi = .none, .os_ver = .{ .major = 13, .minor = 0, .patch = 0 } }, + .{ .arch = .x86_64, .os = .macos, .abi = .none, .os_ver = .{ .major = 10, .minor = 7, .patch = 0 } }, }; pub fn libCGenericName(target: std.Target) [:0]const u8 { @@ -153,7 +149,7 @@ pub fn canBuildLibC(target: std.Target) bool { if (target.cpu.arch == libc.arch and target.os.tag == libc.os and target.abi == libc.abi) { if (target.os.tag == .macos) { const ver = target.os.version_range.semver; - if (ver.min.major != libc.os_ver.?.major) continue; // no match, keep going + return ver.min.order(libc.os_ver.?) != .lt; } return true; } |