| ... | @@ -5628,12 +5628,19 @@ pub fn addCCArgs( | ... | @@ -5628,12 +5628,19 @@ pub fn addCCArgs( |
| 5628 | try argv.appendSlice(&[_][]const u8{ "-target", llvm_triple }); | 5628 | try argv.appendSlice(&[_][]const u8{ "-target", llvm_triple }); |
| 5629 | | 5629 | |
| 5630 | switch (target.os.tag) { | 5630 | switch (target.os.tag) { |
| 5631 | .macos => { | 5631 | .ios, .macos, .tvos, .watchos => |os| { |
| 5632 | try argv.ensureUnusedCapacity(2); | 5632 | try argv.ensureUnusedCapacity(2); |
| 5633 | // Pass the proper -m<os>-version-min argument for darwin. | 5633 | // Pass the proper -m<os>-version-min argument for darwin. |
| 5634 | const ver = target.os.version_range.semver.min; | 5634 | const ver = target.os.version_range.semver.min; |
| 5635 | argv.appendAssumeCapacity(try std.fmt.allocPrint(arena, "-mmacos-version-min={d}.{d}.{d}", .{ | 5635 | argv.appendAssumeCapacity(try std.fmt.allocPrint(arena, "-m{s}{s}-version-min={d}.{d}.{d}", .{ |
| 5636 | ver.major, ver.minor, ver.patch, | 5636 | switch (target.abi) { |
| | 5637 | .simulator => "-simulator", |
| | 5638 | else => "", |
| | 5639 | }, |
| | 5640 | @tagName(os), |
| | 5641 | ver.major, |
| | 5642 | ver.minor, |
| | 5643 | ver.patch, |
| 5637 | })); | 5644 | })); |
| 5638 | // This avoids a warning that sometimes occurs when | 5645 | // This avoids a warning that sometimes occurs when |
| 5639 | // providing both a -target argument that contains a | 5646 | // providing both a -target argument that contains a |
| ... | @@ -5642,23 +5649,6 @@ pub fn addCCArgs( | ... | @@ -5642,23 +5649,6 @@ pub fn addCCArgs( |
| 5642 | // doesn't matter which one gets overridden. | 5649 | // doesn't matter which one gets overridden. |
| 5643 | argv.appendAssumeCapacity("-Wno-overriding-option"); | 5650 | argv.appendAssumeCapacity("-Wno-overriding-option"); |
| 5644 | }, | 5651 | }, |
| 5645 | .ios => switch (target.cpu.arch) { | | |
| 5646 | // Pass the proper -m<os>-version-min argument for darwin. | | |
| 5647 | .x86, .x86_64 => { | | |
| 5648 | const ver = target.os.version_range.semver.min; | | |
| 5649 | try argv.append(try std.fmt.allocPrint( | | |
| 5650 | arena, | | |
| 5651 | "-m{s}-simulator-version-min={d}.{d}.{d}", | | |
| 5652 | .{ @tagName(target.os.tag), ver.major, ver.minor, ver.patch }, | | |
| 5653 | )); | | |
| 5654 | }, | | |
| 5655 | else => { | | |
| 5656 | const ver = target.os.version_range.semver.min; | | |
| 5657 | try argv.append(try std.fmt.allocPrint(arena, "-m{s}-version-min={d}.{d}.{d}", .{ | | |
| 5658 | @tagName(target.os.tag), ver.major, ver.minor, ver.patch, | | |
| 5659 | })); | | |
| 5660 | }, | | |
| 5661 | }, | | |
| 5662 | else => {}, | 5652 | else => {}, |
| 5663 | } | 5653 | } |
| 5664 | | 5654 | |
Alex Rønne Petersen <alex@alexrp.com> 2025-04-10 17:16:44+02:00