authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-22 12:27:18-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-22 12:27:18-07:00
log8484df5bd26350ccfd4d2a5da5aeaed923901ae5
treeb4520d4d7092d620d0cda72ab20cfec2ccabe373
parent3df4707ea79d292f07e0d78ae7dd76266eeb1a16

zig cc: add -Wno-overriding-t-option to clang on darwin

This avoids a warning that sometimes occurs when providing both a -target argument that contains a version as well as the -mmacosx-version-min argument. Zig provides the correct value in both places, so it doesn't matter which one gets overridden.

1 files changed, 8 insertions(+), 1 deletions(-)

src/Compilation.zig+8-1
...@@ -4319,11 +4319,18 @@ pub fn addCCArgs(...@@ -4319,11 +4319,18 @@ pub fn addCCArgs(
4319 }4319 }
4320 },4320 },
4321 .macos => {4321 .macos => {
4322 try argv.ensureUnusedCapacity(2);
4322 // Pass the proper -m<os>-version-min argument for darwin.4323 // Pass the proper -m<os>-version-min argument for darwin.
4323 const ver = target.os.version_range.semver.min;4324 const ver = target.os.version_range.semver.min;
4324 try argv.append(try std.fmt.allocPrint(arena, "-mmacos-version-min={d}.{d}.{d}", .{4325 argv.appendAssumeCapacity(try std.fmt.allocPrint(arena, "-mmacos-version-min={d}.{d}.{d}", .{
4325 ver.major, ver.minor, ver.patch,4326 ver.major, ver.minor, ver.patch,
4326 }));4327 }));
4328 // This avoids a warning that sometimes occurs when
4329 // providing both a -target argument that contains a
4330 // version as well as the -mmacosx-version-min argument.
4331 // Zig provides the correct value in both places, so it
4332 // doesn't matter which one gets overridden.
4333 argv.appendAssumeCapacity("-Wno-overriding-t-option");
4327 },4334 },
4328 .ios, .tvos, .watchos => switch (target.cpu.arch) {4335 .ios, .tvos, .watchos => switch (target.cpu.arch) {
4329 // Pass the proper -m<os>-version-min argument for darwin.4336 // Pass the proper -m<os>-version-min argument for darwin.