mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

@cImport: don't pass args to Aro it doesn't understand

Browse Source
This commit is contained in:
Andrew Kelley 2025-08-13 15:56:56 -07:00
parent 9ad1e83e63
commit e1d6f478c9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Compilation.zig
View File

@ -6692,7 +6692,7 @@ pub fn addTranslateCCArgs(
const resource_path = try comp.dirs.zig_lib.join(arena, &.{"compiler/aro/include"}); const resource_path = try comp.dirs.zig_lib.join(arena, &.{"compiler/aro/include"});
try argv.appendSlice(&.{ "-isystem", resource_path }); try argv.appendSlice(&.{ "-isystem", resource_path });
try comp.addCommonCCArgs(arena, argv, ext, out_dep_path, owner_mod); try comp.addCommonCCArgs(arena, argv, ext, out_dep_path, owner_mod, .aro);
try argv.appendSlice(&[_][]const u8{ "-target", try target.zigTriple(arena) }); try argv.appendSlice(&[_][]const u8{ "-target", try target.zigTriple(arena) });
@ -6728,6 +6728,7 @@ fn addCommonCCArgs(
ext: FileExt, ext: FileExt,
out_dep_path: ?[]const u8, out_dep_path: ?[]const u8,
mod: *Package.Module, mod: *Package.Module,
c_frontend: Config.CFrontend,
) !void { ) !void {
const target = &mod.resolved_target.result; const target = &mod.resolved_target.result;
@ -6911,6 +6912,8 @@ fn addCommonCCArgs(
} }
} }
const is_clang = c_frontend == .clang;
// Only C-family files support these flags. // Only C-family files support these flags.
switch (ext) { switch (ext) {
.c, .c,
@ -6922,7 +6925,7 @@ fn addCommonCCArgs(
.mm, .mm,
.hmm, .hmm,
=> { => {
try argv.append("-fno-spell-checking"); if (is_clang) try argv.append("-fno-spell-checking");
if (target.os.tag == .windows and target.abi.isGnu()) { if (target.os.tag == .windows and target.abi.isGnu()) {
// windows.h has files such as pshpack1.h which do #pragma packing, // windows.h has files such as pshpack1.h which do #pragma packing,
@ -6954,7 +6957,7 @@ fn addCommonCCArgs(
try argv.append(try std.fmt.allocPrint(arena, "-mcmodel={s}", .{@tagName(mod.code_model)})); try argv.append(try std.fmt.allocPrint(arena, "-mcmodel={s}", .{@tagName(mod.code_model)}));
} }
{ if (is_clang) {
var san_arg: std.ArrayListUnmanaged(u8) = .empty; var san_arg: std.ArrayListUnmanaged(u8) = .empty;
const prefix = "-fsanitize="; const prefix = "-fsanitize=";
if (mod.sanitize_c != .off) { if (mod.sanitize_c != .off) {
@ -7102,7 +7105,7 @@ pub fn addCCArgs(
}); });
} }
try comp.addCommonCCArgs(arena, argv, ext, out_dep_path, mod); try comp.addCommonCCArgs(arena, argv, ext, out_dep_path, mod, comp.config.c_frontend);
// Only assembly files support these flags. // Only assembly files support these flags.
switch (ext) { switch (ext) {