From 20aa7c79d1335f70a396b1e648b6b27e58b3b75d Mon Sep 17 00:00:00 2001 From: Bananymous Date: Sat, 22 Jun 2024 17:30:00 +0300 Subject: [PATCH] BuildSystem: Fix crt file installation crt files should be installed always before userpace programs are linked. --- userspace/libraries/LibC/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/userspace/libraries/LibC/CMakeLists.txt b/userspace/libraries/LibC/CMakeLists.txt index 00cbcdbc..41715a6e 100644 --- a/userspace/libraries/LibC/CMakeLists.txt +++ b/userspace/libraries/LibC/CMakeLists.txt @@ -36,8 +36,10 @@ target_compile_options(libc PRIVATE -O2 -g -Wstack-usage=512 -fno-tree-loop-dist target_compile_options(libc PUBLIC -Wall -Wextra -Werror -Wno-error=stack-usage=) function(add_crtx crtx) - add_custom_target(${crtx} COMMAND ${CMAKE_CXX_COMPILER} -c -o ${crtx}.o ${CMAKE_CURRENT_SOURCE_DIR}/arch/${BANAN_ARCH}/${crtx}.S) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${crtx}.o DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL) + add_custom_target(${crtx} + COMMAND ${CMAKE_CXX_COMPILER} -c -o ${CMAKE_INSTALL_LIBDIR}/${crtx}.o ${CMAKE_CURRENT_SOURCE_DIR}/arch/${BANAN_ARCH}/${crtx}.S + DEPENDS sysroot + ) add_dependencies(libc ${crtx}) endfunction()