diff options
| author | Tim Schumacher <timschumi@gmx.de> | 2022-07-15 15:51:00 +0200 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2022-07-19 11:00:35 +0100 |
| commit | 28061cf94d882bba7ce64a4b61454f2cf07bf4a5 (patch) | |
| tree | 62535cce16c065a05106aef6a9d3c1328d768634 /Userland | |
| parent | dac361e33078d93cc8f33f564014661774adb203 (diff) | |
| download | serenity-28061cf94d882bba7ce64a4b61454f2cf07bf4a5.zip | |
Everywhere: Fully remove the separate LibPthread directory
Diffstat (limited to 'Userland')
| -rw-r--r-- | Userland/Libraries/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Userland/Libraries/LibC/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Userland/Libraries/LibPthread/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Userland/Libraries/CMakeLists.txt b/Userland/Libraries/CMakeLists.txt index 8deb83b589..f19cd94dbc 100644 --- a/Userland/Libraries/CMakeLists.txt +++ b/Userland/Libraries/CMakeLists.txt @@ -39,7 +39,6 @@ add_subdirectory(LibMarkdown) add_subdirectory(LibPCIDB) add_subdirectory(LibPDF) add_subdirectory(LibProtocol) -add_subdirectory(LibPthread) add_subdirectory(LibRegex) add_subdirectory(LibSanitizer) add_subdirectory(LibSoftGPU) diff --git a/Userland/Libraries/LibC/CMakeLists.txt b/Userland/Libraries/LibC/CMakeLists.txt index 2319a241e1..916d76da37 100644 --- a/Userland/Libraries/LibC/CMakeLists.txt +++ b/Userland/Libraries/LibC/CMakeLists.txt @@ -179,3 +179,8 @@ 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 dummy target and a linker script for LibPthread that tells everything to link against LibC instead. +add_library(LibPthread INTERFACE) +target_link_libraries(LibPthread INTERFACE LibC) +file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libpthread.so" "INPUT(libc.so)") diff --git a/Userland/Libraries/LibPthread/CMakeLists.txt b/Userland/Libraries/LibPthread/CMakeLists.txt deleted file mode 100644 index ba5fc79edb..0000000000 --- a/Userland/Libraries/LibPthread/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(LibPthread INTERFACE) -target_link_libraries(LibPthread INTERFACE LibC) -file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libpthread.so" "INPUT(libc.so)") |