authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-08-25 02:44:57+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-08-25 21:59:35+02:00
logade570f0d5cda6c2c515283506ffab85263c0a97
treef9f2b10d4d19b9ce0087c3a78750e06acec4d3ba
parent91040b567863e7c068b21d7c6bbf76a1d28a2b2d

zig cc: don't pass -mcmodel for assembly files

It does nothing but generate a warning for these.

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

src/Compilation.zig+4-4
...@@ -6838,10 +6838,6 @@ pub fn addCCArgs(...@@ -6838,10 +6838,6 @@ pub fn addCCArgs(
6838 try argv.append("-municode");6838 try argv.append("-municode");
6839 }6839 }
68406840
6841 if (mod.code_model != .default) {
6842 try argv.append(try std.fmt.allocPrint(arena, "-mcmodel={s}", .{@tagName(mod.code_model)}));
6843 }
6844
6845 try argv.ensureUnusedCapacity(2);6841 try argv.ensureUnusedCapacity(2);
6846 switch (comp.config.debug_format) {6842 switch (comp.config.debug_format) {
6847 .strip => {},6843 .strip => {},
...@@ -7136,6 +7132,10 @@ pub fn addCCArgs(...@@ -7136,6 +7132,10 @@ pub fn addCCArgs(
7136 .ll,7132 .ll,
7137 .bc,7133 .bc,
7138 => {7134 => {
7135 if (mod.code_model != .default) {
7136 try argv.append(try std.fmt.allocPrint(arena, "-mcmodel={s}", .{@tagName(mod.code_model)}));
7137 }
7138
7139 if (target_util.clangSupportsTargetCpuArg(target)) {7139 if (target_util.clangSupportsTargetCpuArg(target)) {
7140 if (target.cpu.model.llvm_name) |llvm_name| {7140 if (target.cpu.model.llvm_name) |llvm_name| {
7141 try argv.appendSlice(&[_][]const u8{7141 try argv.appendSlice(&[_][]const u8{