From 8778bb347312c0b0691a6c84d82ef23879c709fd Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Sun, 14 Aug 2022 12:39:51 +0200
Subject: [PATCH] Everywhere: Fully remove the separate LibDl directory

---
 Toolchain/BuildClang.sh                 | 4 ++--
 Toolchain/BuildIt.sh                    | 4 +---
 Userland/Libraries/CMakeLists.txt       | 1 -
 Userland/Libraries/LibC/CMakeLists.txt  | 5 +++++
 Userland/Libraries/LibDl/CMakeLists.txt | 4 ----
 5 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 Userland/Libraries/LibDl/CMakeLists.txt

diff --git a/Toolchain/BuildClang.sh b/Toolchain/BuildClang.sh
index 598e994e26..9695362da3 100755
--- a/Toolchain/BuildClang.sh
+++ b/Toolchain/BuildClang.sh
@@ -248,14 +248,14 @@ popd
 # === COPY HEADERS ===
 
 SRC_ROOT=$($REALPATH "$DIR"/..)
-FILES=$(find "$SRC_ROOT"/Kernel/API "$SRC_ROOT"/Userland/Libraries/LibC "$SRC_ROOT"/Userland/Libraries/LibM "$SRC_ROOT"/Userland/Libraries/LibDl -name '*.h' -print)
+FILES=$(find "$SRC_ROOT"/Kernel/API "$SRC_ROOT"/Userland/Libraries/LibC "$SRC_ROOT"/Userland/Libraries/LibM -name '*.h' -print)
 
 for arch in $ARCHS; do
     mkdir -p "$BUILD/${arch}clang"
     pushd "$BUILD/${arch}clang"
         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/Userland/Libraries/LibM@@" -e "s@$SRC_ROOT/Userland/Libraries/LibDl@@" -e "s@$SRC_ROOT/Kernel/@Kernel/@")
+            target=$(echo "$header" | "$SED" -e "s@$SRC_ROOT/Userland/Libraries/LibC@@" -e "s@$SRC_ROOT/Userland/Libraries/LibM@@" -e "s@$SRC_ROOT/Kernel/@Kernel/@")
             buildstep "system_headers" "$INSTALL" -D "$header" "Root/usr/include/$target"
         done
     popd
diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildIt.sh
index aa8b166b12..004de909ad 100755
--- a/Toolchain/BuildIt.sh
+++ b/Toolchain/BuildIt.sh
@@ -363,7 +363,7 @@ pushd "$DIR/Build/$ARCH"
         buildstep "binutils/install" "$MAKE" install || exit 1
     popd
 
-    echo "XXX serenity libc, libdl and libm headers"
+    echo "XXX serenity libc and libm headers"
     mkdir -p "$BUILD"
     pushd "$BUILD"
         mkdir -p Root/usr/include/
@@ -373,14 +373,12 @@ pushd "$DIR/Build/$ARCH"
             "$SRC_ROOT"/Kernel/API \
             "$SRC_ROOT"/Kernel/Arch \
             "$SRC_ROOT"/Userland/Libraries/LibC \
-            "$SRC_ROOT"/Userland/Libraries/LibDl \
             "$SRC_ROOT"/Userland/Libraries/LibM \
             -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/Userland/Libraries/LibDl@@" \
                 -e "s@$SRC_ROOT/Userland/Libraries/LibM@@" \
                 -e "s@$SRC_ROOT/Kernel/@Kernel/@")
             buildstep "system_headers" $INSTALL -D "$header" "Root/usr/include/$target"
diff --git a/Userland/Libraries/CMakeLists.txt b/Userland/Libraries/CMakeLists.txt
index a7ff04b791..56722c680c 100644
--- a/Userland/Libraries/CMakeLists.txt
+++ b/Userland/Libraries/CMakeLists.txt
@@ -15,7 +15,6 @@ add_subdirectory(LibDebug)
 add_subdirectory(LibDesktop)
 add_subdirectory(LibDeviceTree)
 add_subdirectory(LibDiff)
-add_subdirectory(LibDl)
 add_subdirectory(LibDNS)
 add_subdirectory(LibDSP)
 add_subdirectory(LibEDID)
diff --git a/Userland/Libraries/LibC/CMakeLists.txt b/Userland/Libraries/LibC/CMakeLists.txt
index 88906337b3..58e1fb760d 100644
--- a/Userland/Libraries/LibC/CMakeLists.txt
+++ b/Userland/Libraries/LibC/CMakeLists.txt
@@ -182,3 +182,8 @@ add_dependencies(LibC LibM LibSystem LibCStatic)
 
 # Provide a linker script instead of LibPthread that tells everything to link against LibC.
 file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libpthread.so" "INPUT(libc.so)")
+
+# Provide a dummy target and a linker script for LibDl that tells everything to link against LibC instead.
+add_library(LibDl INTERFACE)
+target_link_libraries(LibDl INTERFACE LibC)
+file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libdl.so" "INPUT(libc.so)")
diff --git a/Userland/Libraries/LibDl/CMakeLists.txt b/Userland/Libraries/LibDl/CMakeLists.txt
deleted file mode 100644
index b86c5f768e..0000000000
--- a/Userland/Libraries/LibDl/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Provide a dummy target and a linker script that tells everything to link against LibC instead.
-add_library(LibDl INTERFACE)
-target_link_libraries(LibDl INTERFACE LibC)
-file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libdl.so" "INPUT(libc.so)")