소스 검색

LibC: Remove the LibM interface target

Tim Schumacher 2 년 전
부모
커밋
ef9b543426

+ 2 - 6
Userland/Libraries/LibC/CMakeLists.txt

@@ -153,7 +153,7 @@ endif()
 
 
 add_library(LibCStaticWithoutDeps STATIC ${SOURCES})
 add_library(LibCStaticWithoutDeps STATIC ${SOURCES})
 target_link_libraries(LibCStaticWithoutDeps PUBLIC ssp LibTimeZone PRIVATE NoCoverage)
 target_link_libraries(LibCStaticWithoutDeps PUBLIC ssp LibTimeZone PRIVATE NoCoverage)
-add_dependencies(LibCStaticWithoutDeps LibM LibSystem LibUBSanitizer)
+add_dependencies(LibCStaticWithoutDeps LibSystem LibUBSanitizer)
 
 
 add_custom_target(LibCStatic
 add_custom_target(LibCStatic
         COMMAND ${CMAKE_AR} -x $<TARGET_FILE:LibCStaticWithoutDeps>
         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)
 target_link_libraries(LibC ssp system LibTimeZone)
 
 
 # We mark LibCStatic as a dependency of LibC because this triggers the build of the LibCStatic target
 # 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.
 # 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}/libpthread.so" "INPUT(libc.so)")
 file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libdl.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)")
 file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libm.so" "INPUT(libc.so)")

+ 1 - 1
Userland/Libraries/LibGL/CMakeLists.txt

@@ -15,4 +15,4 @@ set(SOURCES
 )
 )
 
 
 serenity_lib(LibGL gl)
 serenity_lib(LibGL gl)
-target_link_libraries(LibGL LibM LibCore LibGfx LibGPU)
+target_link_libraries(LibGL LibCore LibGfx LibGPU)

+ 1 - 1
Userland/Libraries/LibGfx/CMakeLists.txt

@@ -51,4 +51,4 @@ set(SOURCES
 )
 )
 
 
 serenity_lib(LibGfx gfx)
 serenity_lib(LibGfx gfx)
-target_link_libraries(LibGfx LibM LibCompress LibCore LibTextCodec LibIPC)
+target_link_libraries(LibGfx LibCompress LibCore LibTextCodec LibIPC)

+ 1 - 1
Userland/Libraries/LibJS/CMakeLists.txt

@@ -249,4 +249,4 @@ set(SOURCES
 )
 )
 
 
 serenity_lib(LibJS js)
 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)

+ 1 - 1
Userland/Libraries/LibSoftGPU/CMakeLists.txt

@@ -8,4 +8,4 @@ set(SOURCES
 
 
 add_compile_options(-Wno-psabi)
 add_compile_options(-Wno-psabi)
 serenity_lib(LibSoftGPU softgpu)
 serenity_lib(LibSoftGPU softgpu)
-target_link_libraries(LibSoftGPU LibM LibCore LibGfx)
+target_link_libraries(LibSoftGPU LibCore LibGfx)