From da0e28dccc7f6ba66ba95f3f1ada4a9a5e87b2ab Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Sun, 14 Aug 2022 12:44:35 +0200 Subject: [PATCH] LibC: Remove the `LibDl` interface target --- Tests/LibELF/CMakeLists.txt | 2 +- Userland/Libraries/LibC/CMakeLists.txt | 6 +----- Userland/Libraries/LibGPU/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Tests/LibELF/CMakeLists.txt b/Tests/LibELF/CMakeLists.txt index cfb00be94a..64924b06ba 100644 --- a/Tests/LibELF/CMakeLists.txt +++ b/Tests/LibELF/CMakeLists.txt @@ -24,5 +24,5 @@ set(TEST_SOURCES ) foreach(source IN LISTS TEST_SOURCES) - serenity_test("${source}" LibELF LIBS LibDl) + serenity_test("${source}" LibELF) endforeach() diff --git a/Userland/Libraries/LibC/CMakeLists.txt b/Userland/Libraries/LibC/CMakeLists.txt index 58e1fb760d..1715956920 100644 --- a/Userland/Libraries/LibC/CMakeLists.txt +++ b/Userland/Libraries/LibC/CMakeLists.txt @@ -180,10 +180,6 @@ target_link_libraries(LibC ssp system LibTimeZone) # We mark LibCStatic as a dependency of LibC because this triggers the build of the LibCStatic target add_dependencies(LibC LibM LibSystem LibCStatic) -# Provide a linker script instead of LibPthread that tells everything to link against LibC. +# Provide a linker script instead of various other libraries 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/LibGPU/CMakeLists.txt b/Userland/Libraries/LibGPU/CMakeLists.txt index 05a77dfb95..da17d4b545 100644 --- a/Userland/Libraries/LibGPU/CMakeLists.txt +++ b/Userland/Libraries/LibGPU/CMakeLists.txt @@ -3,6 +3,6 @@ set(SOURCES ) serenity_lib(LibGPU gpu) -target_link_libraries(LibGPU LibCore LibDl) +target_link_libraries(LibGPU LibCore) add_dependencies(LibGPU LibSoftGPU)