mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-17 23:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7957 from mk12/catalina

Browse Source 
Use -isysroot on Catalina too, not just Big Sur
This commit is contained in:
Michael Dusan 2021-02-06 20:12:09 -05:00 committed by GitHub
commit 905c85be96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.zig
View File

@ -1536,8 +1536,9 @@ fn buildOutputType(
}
const has_sysroot = if (comptime std.Target.current.isDarwin()) outer: {
const at_least_big_sur = target_info.target.os.getVersionRange().semver.min.major >= 11;
if (at_least_big_sur) {
const min = target_info.target.os.getVersionRange().semver.min;
const at_least_catalina = min.major >= 11 or (min.major >= 10 and min.minor >= 15);
if (at_least_catalina) {
const sdk_path = try std.zig.system.getSDKPath(arena);
try clang_argv.ensureCapacity(clang_argv.items.len + 2);
clang_argv.appendAssumeCapacity("-isysroot");