From 9410f0a96cb347e0fea88d8e58eb8f85ab618abf Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Sat, 15 Jul 2023 18:09:28 +0200
Subject: [PATCH] Toolchain: Copy the same headers as GNU when building Clang

We were previously missing `Kernel/Arch`, which gets included by
`Kernel/API`.

While at it, remove `AK` from the list of copied headers for the
toolchain, as nothing in our LibC headers should ever publicly depend on
AK.
---
 Toolchain/BuildClang.sh | 3 ++-
 Toolchain/BuildGNU.sh   | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Toolchain/BuildClang.sh b/Toolchain/BuildClang.sh
index 33025231a3..df87bafc8d 100755
--- a/Toolchain/BuildClang.sh
+++ b/Toolchain/BuildClang.sh
@@ -249,6 +249,7 @@ popd
 SRC_ROOT=$($REALPATH "$DIR"/..)
 FILES=$(find \
     "$SRC_ROOT"/Kernel/API \
+    "$SRC_ROOT"/Kernel/Arch \
     "$SRC_ROOT"/Userland/Libraries/LibC \
     "$SRC_ROOT"/Userland/Libraries/LibELF/ELFABI.h \
     "$SRC_ROOT"/Userland/Libraries/LibRegex/RegexDefs.h \
@@ -259,8 +260,8 @@ for arch in $ARCHS; do
         mkdir -p Root/usr/include/
         for header in $FILES; do
             target=$(echo "$header" | "$SED" \
-                -e "s|$SRC_ROOT/Userland/Libraries/LibC||" \
                 -e "s|$SRC_ROOT/Kernel/|Kernel/|" \
+                -e "s|$SRC_ROOT/Userland/Libraries/LibC||" \
                 -e "s|$SRC_ROOT/Userland/Libraries/LibELF/|LibELF/|" \
                 -e "s|$SRC_ROOT/Userland/Libraries/LibRegex/|LibRegex/|")
             buildstep "system_headers" "$INSTALL" -D "$header" "Root/usr/include/$target"
diff --git a/Toolchain/BuildGNU.sh b/Toolchain/BuildGNU.sh
index 7fd8880aa3..8ceb3064d0 100755
--- a/Toolchain/BuildGNU.sh
+++ b/Toolchain/BuildGNU.sh
@@ -266,7 +266,6 @@ pushd "$DIR/Build/$ARCH"
         mkdir -p Root/usr/include/
         SRC_ROOT=$($REALPATH "$DIR"/..)
         FILES=$(find \
-            "$SRC_ROOT"/AK \
             "$SRC_ROOT"/Kernel/API \
             "$SRC_ROOT"/Kernel/Arch \
             "$SRC_ROOT"/Userland/Libraries/LibC \
@@ -275,7 +274,6 @@ pushd "$DIR/Build/$ARCH"
             -name '*.h' -print)
         for header in $FILES; do
             target=$(echo "$header" | sed \
-                -e "s|$SRC_ROOT/AK/|AK/|" \
                 -e "s|$SRC_ROOT/Userland/Libraries/LibC||" \
                 -e "s|$SRC_ROOT/Kernel/|Kernel/|" \
                 -e "s|$SRC_ROOT/Userland/Libraries/LibELF/|LibELF/|" \