diff --git a/cmake/InstallSymlink.cmake b/cmake/InstallSymlink.cmake index 04e872186..bbc752197 100644 --- a/cmake/InstallSymlink.cmake +++ b/cmake/InstallSymlink.cmake @@ -20,9 +20,8 @@ macro(InstallSymlink _filepath _sympath) if (BINARY_PACKAGING_MODE) execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink ${_filepath} - ${CMAKE_CURRENT_BINARY_DIR}/symlinks/${_symname}) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/symlinks) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/symlinks/${_symname} + ${CMAKE_CURRENT_BINARY_DIR}/${_symname}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_symname} DESTINATION ${_installdir}) else () # scripting the symlink installation at install time should work diff --git a/src/libsystem/CMakeLists.txt b/src/libsystem/CMakeLists.txt index 9ab92aaa6..939b1a45f 100644 --- a/src/libsystem/CMakeLists.txt +++ b/src/libsystem/CMakeLists.txt @@ -8,7 +8,7 @@ endif(COMMAND cmake_policy) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -ggdb") -set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--warn-unresolved-symbols -Wl,--unresolved-symbols=report-all -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map") +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--warn-unresolved-symbols -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map") include_directories(${DARLING_TOP_DIRECTORY}/src/libc/fbsdcompat) include_directories(${DARLING_TOP_DIRECTORY}/src/kernel/libsyscall/wrappers) @@ -37,7 +37,7 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) add_library(system SHARED ${libsystem_sources}) -target_link_libraries(system PRIVATE dyld) +#target_link_libraries(system PRIVATE dyld) target_link_libraries(system PUBLIC system_malloc system_c system_kernel keymgr system_m system_info system_notify libdispatch_shared objc launch removefile system_copyfile unwind system_coreservices CommonCrypto)