diff options
| author | Tim Schumacher <timschumi@gmx.de> | 2022-09-06 01:03:59 +0200 |
|---|---|---|
| committer | Brian Gianforcaro <b.gianfo@gmail.com> | 2022-09-16 16:09:19 +0000 |
| commit | ef9b5434263baa255be2f674dc25c6b994f5b8cc (patch) | |
| tree | 2be385c278d62972b7944c733801621634fc3e23 /Userland/Libraries | |
| parent | 1b25c38b8be87c98ae8deb4765d9ee8310b383e7 (diff) | |
| download | serenity-ef9b5434263baa255be2f674dc25c6b994f5b8cc.zip | |
LibC: Remove the LibM interface target
Diffstat (limited to 'Userland/Libraries')
| -rw-r--r-- | Userland/Libraries/LibC/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Userland/Libraries/LibGL/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Userland/Libraries/LibGfx/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Userland/Libraries/LibJS/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Userland/Libraries/LibSoftGPU/CMakeLists.txt | 2 |
5 files changed, 6 insertions, 10 deletions
diff --git a/Userland/Libraries/LibC/CMakeLists.txt b/Userland/Libraries/LibC/CMakeLists.txt index 295964cbe2..b5330a7790 100644 --- a/Userland/Libraries/LibC/CMakeLists.txt +++ b/Userland/Libraries/LibC/CMakeLists.txt @@ -153,7 +153,7 @@ endif() add_library(LibCStaticWithoutDeps STATIC ${SOURCES}) target_link_libraries(LibCStaticWithoutDeps PUBLIC ssp LibTimeZone PRIVATE NoCoverage) -add_dependencies(LibCStaticWithoutDeps LibM LibSystem LibUBSanitizer) +add_dependencies(LibCStaticWithoutDeps LibSystem LibUBSanitizer) add_custom_target(LibCStatic COMMAND ${CMAKE_AR} -x $<TARGET_FILE:LibCStaticWithoutDeps> @@ -179,13 +179,9 @@ add_dependencies(LibC crti crt0 crt0_shared crtn) 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) +add_dependencies(LibC LibSystem LibCStatic) # 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)") file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libdl.so" "INPUT(libc.so)") - -# Provide a dummy target and a linker script for LibM that tells everything to link against LibC instead. -add_library(LibM INTERFACE) -target_link_libraries(LibM INTERFACE LibC) file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libm.so" "INPUT(libc.so)") diff --git a/Userland/Libraries/LibGL/CMakeLists.txt b/Userland/Libraries/LibGL/CMakeLists.txt index 347ba5bb36..bbaf8ab13b 100644 --- a/Userland/Libraries/LibGL/CMakeLists.txt +++ b/Userland/Libraries/LibGL/CMakeLists.txt @@ -15,4 +15,4 @@ set(SOURCES ) serenity_lib(LibGL gl) -target_link_libraries(LibGL LibM LibCore LibGfx LibGPU) +target_link_libraries(LibGL LibCore LibGfx LibGPU) diff --git a/Userland/Libraries/LibGfx/CMakeLists.txt b/Userland/Libraries/LibGfx/CMakeLists.txt index 9acef40cf1..8a69b2fb5c 100644 --- a/Userland/Libraries/LibGfx/CMakeLists.txt +++ b/Userland/Libraries/LibGfx/CMakeLists.txt @@ -51,4 +51,4 @@ set(SOURCES ) serenity_lib(LibGfx gfx) -target_link_libraries(LibGfx LibM LibCompress LibCore LibTextCodec LibIPC) +target_link_libraries(LibGfx LibCompress LibCore LibTextCodec LibIPC) diff --git a/Userland/Libraries/LibJS/CMakeLists.txt b/Userland/Libraries/LibJS/CMakeLists.txt index f49ab0d472..0d575b0a36 100644 --- a/Userland/Libraries/LibJS/CMakeLists.txt +++ b/Userland/Libraries/LibJS/CMakeLists.txt @@ -249,4 +249,4 @@ set(SOURCES ) serenity_lib(LibJS js) -target_link_libraries(LibJS LibM LibCore LibCrypto LibRegex LibSyntax LibLocale LibUnicode) +target_link_libraries(LibJS LibCore LibCrypto LibRegex LibSyntax LibLocale LibUnicode) diff --git a/Userland/Libraries/LibSoftGPU/CMakeLists.txt b/Userland/Libraries/LibSoftGPU/CMakeLists.txt index 5a50d7bbe1..e7ce92259a 100644 --- a/Userland/Libraries/LibSoftGPU/CMakeLists.txt +++ b/Userland/Libraries/LibSoftGPU/CMakeLists.txt @@ -8,4 +8,4 @@ set(SOURCES add_compile_options(-Wno-psabi) serenity_lib(LibSoftGPU softgpu) -target_link_libraries(LibSoftGPU LibM LibCore LibGfx) +target_link_libraries(LibSoftGPU LibCore LibGfx) |