From 2747fca2267d909dad582bc129e4a5b6f686639b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Fri, 26 Jul 2024 04:50:20 +0200
Subject: [PATCH] generate_linux_syscalls: Simplify include paths.

Using the tooling includes means we won't run into the asm/bitsperlong.h issue.
---
 tools/generate_linux_syscalls.zig | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/tools/generate_linux_syscalls.zig b/tools/generate_linux_syscalls.zig
index 3860935017..29ae775a8e 100644
--- a/tools/generate_linux_syscalls.zig
+++ b/tools/generate_linux_syscalls.zig
@@ -273,8 +273,8 @@ pub fn main() !void {
             "-P",
             "-nostdinc",
             // Using -I=[dir] includes the zig linux headers, which we don't want.
-            "-Iinclude",
-            "-Iinclude/uapi",
+            "-Itools/include",
+            "-Itools/include/uapi",
             // Output the syscall in a format we can easily recognize.
             "-D __SYSCALL(nr, nm)=zigsyscall nm nr",
             "arch/arm64/include/uapi/asm/unistd.h",
@@ -328,9 +328,8 @@ pub fn main() !void {
             "-dD",
             "-P",
             "-nostdinc",
-            "-Iinclude",
-            "-Iinclude/uapi",
-            "-Iarch/riscv/include/uapi",
+            "-Itools/include",
+            "-Itools/include/uapi",
             "-D __SYSCALL(nr, nm)=zigsyscall nm nr",
             "arch/riscv/include/uapi/asm/unistd.h",
         };
@@ -383,9 +382,8 @@ pub fn main() !void {
             "-dD",
             "-P",
             "-nostdinc",
-            "-Iinclude",
-            "-Iinclude/uapi",
-            "-Iarch/riscv/include/uapi",
+            "-Itools/include",
+            "-Itools/include/uapi",
             "-D __SYSCALL(nr, nm)=zigsyscall nm nr",
             "arch/riscv/include/uapi/asm/unistd.h",
         };
@@ -438,9 +436,8 @@ pub fn main() !void {
             "-dD",
             "-P",
             "-nostdinc",
-            "-Iinclude",
-            "-Iinclude/uapi",
-            "-Iarch/loongarch/include/uapi",
+            "-Itools/include",
+            "-Itools/include/uapi",
             "-D __SYSCALL(nr, nm)=zigsyscall nm nr",
             "arch/loongarch/include/uapi/asm/unistd.h",
         };