Commit `124448c1b6`

Frank Denis <github@pureftpd.org>

2023-07-20 16:00:11

Include system headers path when targeting assembly_with_cpp

This is consistent with what clang and gcc are doing, because headers such as <cet.h> are specifically designed to be used in the context of assembly code. Fixes #16449

master

1 parent 3f15010

Changed files (1)

src

Compilation.zig

@@ -4438,6 +4438,12 @@ pub fn addCCArgs(
         },
         .shared_library, .ll, .bc, .unknown, .static_library, .object, .def, .zig, .res => {},
         .assembly, .assembly_with_cpp => {
+            if (ext == .assembly_with_cpp) {
+                const c_headers_dir = try std.fs.path.join(arena, &[_][]const u8{ comp.zig_lib_directory.path.?, "include" });
+                try argv.append("-isystem");
+                try argv.append(c_headers_dir);
+            }
+
             // The Clang assembler does not accept the list of CPU features like the
             // compiler frontend does. Therefore we must hard-code the -m flags for
             // all CPU features here.

Commit 124448c1b6

Commit `124448c1b6`