diff options
| author | Xavier Del Campo Romero <xavi92@disroot.org> | 2025-11-11 20:35:20 +0100 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi92@disroot.org> | 2025-11-11 20:55:58 +0100 |
| commit | 5ce25ae3b5d8666d373f7d7e336546ce8508c213 (patch) | |
| tree | 4aacb570241c1005590a47ac49adb4b75a8ffd8d /programs | |
| parent | f7ad4d9216b488f76ed4b3c8e423cd926e134b9d (diff) | |
fixes
Diffstat (limited to 'programs')
| -rw-r--r-- | programs/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | programs/initd/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | programs/wasm-clang-toolchain.cmake | 5 |
3 files changed, 4 insertions, 25 deletions
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt index 6d1cc25..0ac59e8 100644 --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt @@ -24,21 +24,12 @@ find_package(Clang REQUIRED) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin) foreach(p ${programs}) - set(cflags " \ - -g \ - ") - - set(ldflags " \ - ") - ExternalProject_Add(${p}_wnix SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/${p} BUILD_ALWAYS ON CMAKE_ARGS -D CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_LIST_DIR}/wasm-clang-toolchain.cmake - -D CMAKE_C_FLAGS=${cflags} - -D CMAKE_EXE_LINKER_FLAGS=${ldflags} - -D CMAKE_BUILD_TYPE=Release + -D CMAKE_BUILD_TYPE=Debug -D CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} -D CMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/programs/initd/CMakeLists.txt b/programs/initd/CMakeLists.txt index 500782a..2152169 100644 --- a/programs/initd/CMakeLists.txt +++ b/programs/initd/CMakeLists.txt @@ -18,14 +18,5 @@ cmake_minimum_required(VERSION 3.13) include(GNUInstallDirs) project(initd C) add_executable(${PROJECT_NAME} initd.c) -add_subdirectory(../wnix ${CMAKE_CURRENT_BINARY_DIR}/wnix) -target_link_libraries(${PROJECT_NAME} PRIVATE wnix) -# TODO: Debugging symbols could still be there, but nwc still has issues. -add_custom_target(${PROJECT_NAME}_strip ALL - ${CMAKE_STRIP} ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} - BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} -) -add_dependencies(${PROJECT_NAME}_strip ${PROJECT_NAME}) -install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) +include(wnix_program) +wnix_program() diff --git a/programs/wasm-clang-toolchain.cmake b/programs/wasm-clang-toolchain.cmake index 450b0f9..a6890f8 100644 --- a/programs/wasm-clang-toolchain.cmake +++ b/programs/wasm-clang-toolchain.cmake @@ -28,10 +28,7 @@ set(CMAKE_C_FLAGS " \ -nostdlib \ ") set(CMAKE_EXE_LINKER_FLAGS "\ + ${CMAKE_EXE_LINKER_FLAGS} \ -Wl,--threads=1 \ - --target=wasm32-unknown-unknown-wasm \ - -fno-exceptions \ - -nostdinc \ - -nostdlib \ ") set(CMAKE_STRIP ${WASI_SDK_STRIP}) |