Userspace: Install libdl, libm, libpthread as symlinks to libc
Having dummy libraries was just unnecessary
This commit is contained in:
@@ -3,14 +3,11 @@ set(USERSPACE_LIBRARIES
|
|||||||
LibC
|
LibC
|
||||||
LibClipboard
|
LibClipboard
|
||||||
LibDEFLATE
|
LibDEFLATE
|
||||||
LibDL
|
|
||||||
LibELF
|
LibELF
|
||||||
LibFont
|
LibFont
|
||||||
LibGUI
|
LibGUI
|
||||||
LibImage
|
LibImage
|
||||||
LibInput
|
LibInput
|
||||||
LibMath
|
|
||||||
LibPthread
|
|
||||||
LibQR
|
LibQR
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -105,6 +105,13 @@ target_link_options(libc-shared PRIVATE -nolibc -nostdlib++)
|
|||||||
install(TARGETS libc-static OPTIONAL)
|
install(TARGETS libc-static OPTIONAL)
|
||||||
install(TARGETS libc-shared OPTIONAL)
|
install(TARGETS libc-shared OPTIONAL)
|
||||||
|
|
||||||
|
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libc.a\" \"${CMAKE_INSTALL_LIBDIR}/libdl.a\")")
|
||||||
|
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libc.so\" \"${CMAKE_INSTALL_LIBDIR}/libdl.so\")")
|
||||||
|
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libc.a\" \"${CMAKE_INSTALL_LIBDIR}/libm.a\")")
|
||||||
|
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libc.so\" \"${CMAKE_INSTALL_LIBDIR}/libm.so\")")
|
||||||
|
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libc.a\" \"${CMAKE_INSTALL_LIBDIR}/libpthread.a\")")
|
||||||
|
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libc.so\" \"${CMAKE_INSTALL_LIBDIR}/libpthread.so\")")
|
||||||
|
|
||||||
set_target_properties(libc-static PROPERTIES OUTPUT_NAME libc)
|
set_target_properties(libc-static PROPERTIES OUTPUT_NAME libc)
|
||||||
set_target_properties(libc-shared PROPERTIES OUTPUT_NAME libc)
|
set_target_properties(libc-shared PROPERTIES OUTPUT_NAME libc)
|
||||||
|
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
set(SOURCES
|
|
||||||
dummy.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
add_library(libdl-static STATIC ${SOURCES})
|
|
||||||
add_library(libdl-shared SHARED ${SOURCES})
|
|
||||||
|
|
||||||
target_link_options(libdl-static PRIVATE -nolibc)
|
|
||||||
target_link_options(libdl-shared PRIVATE -nolibc)
|
|
||||||
|
|
||||||
banan_link_library(libdl-static libc)
|
|
||||||
banan_link_library(libdl-shared libc)
|
|
||||||
|
|
||||||
set_target_properties(libdl-static PROPERTIES OUTPUT_NAME libdl)
|
|
||||||
set_target_properties(libdl-shared PROPERTIES OUTPUT_NAME libdl)
|
|
||||||
|
|
||||||
install(TARGETS libdl-static OPTIONAL)
|
|
||||||
install(TARGETS libdl-shared OPTIONAL)
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
set(SOURCES
|
|
||||||
dummy.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
add_library(libmath-static STATIC ${SOURCES})
|
|
||||||
add_library(libmath-shared SHARED ${SOURCES})
|
|
||||||
|
|
||||||
target_link_options(libmath-static PRIVATE -nolibc)
|
|
||||||
target_link_options(libmath-shared PRIVATE -nolibc)
|
|
||||||
|
|
||||||
banan_link_library(libmath-static libc)
|
|
||||||
banan_link_library(libmath-shared libc)
|
|
||||||
|
|
||||||
set_target_properties(libmath-static PROPERTIES OUTPUT_NAME libm)
|
|
||||||
set_target_properties(libmath-shared PROPERTIES OUTPUT_NAME libm)
|
|
||||||
|
|
||||||
install(TARGETS libmath-static OPTIONAL)
|
|
||||||
install(TARGETS libmath-shared OPTIONAL)
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
set(SOURCES
|
|
||||||
dummy.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
add_library(libpthread-static STATIC ${SOURCES})
|
|
||||||
add_library(libpthread-shared SHARED ${SOURCES})
|
|
||||||
|
|
||||||
target_link_options(libpthread-static PRIVATE -nolibc)
|
|
||||||
target_link_options(libpthread-shared PRIVATE -nolibc)
|
|
||||||
|
|
||||||
banan_link_library(libpthread-static libc)
|
|
||||||
banan_link_library(libpthread-shared libc)
|
|
||||||
|
|
||||||
set_target_properties(libpthread-static PROPERTIES OUTPUT_NAME libpthread)
|
|
||||||
set_target_properties(libpthread-shared PROPERTIES OUTPUT_NAME libpthread)
|
|
||||||
|
|
||||||
install(TARGETS libpthread-static OPTIONAL)
|
|
||||||
install(TARGETS libpthread-shared OPTIONAL)
|
|
||||||
Reference in New Issue
Block a user