diff --git a/src/libc/CMakeLists.txt b/src/libc/CMakeLists.txt index 3a5fb071a..300882df8 100644 --- a/src/libc/CMakeLists.txt +++ b/src/libc/CMakeLists.txt @@ -222,9 +222,8 @@ add_circular(system_c FAT OBJECTS install(TARGETS system_c DESTINATION libexec/darling/usr/lib/system) -set(CMAKE_AR "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ar") -set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ranlib") -add_library(libc_static STATIC +include(darling_static_lib) +add_darling_static_library(libc_static SOURCES $ $ $ diff --git a/src/libmacho/CMakeLists.txt b/src/libmacho/CMakeLists.txt index 3dccc5858..f9691eedc 100644 --- a/src/libmacho/CMakeLists.txt +++ b/src/libmacho/CMakeLists.txt @@ -39,8 +39,7 @@ add_circular(macho FAT #target_link_libraries(macho system_kernel) #make_fat(macho) -set(CMAKE_AR "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ar") -set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ranlib") -add_library(macho_static STATIC $) +include(darling_static_lib) +add_darling_static_library(macho_static SOURCES $) install(TARGETS macho DESTINATION libexec/darling/usr/lib/system) diff --git a/src/libunwind/CMakeLists.txt b/src/libunwind/CMakeLists.txt index 5a73dd58a..a7d8fcf7c 100644 --- a/src/libunwind/CMakeLists.txt +++ b/src/libunwind/CMakeLists.txt @@ -46,7 +46,8 @@ add_circular(unwind FAT #set_target_properties(unwind PROPERTIES LINKER_LANGUAGE C) #make_fat(unwind) -add_library(unwind_static STATIC ${libunwind_sources}) +include(darling_static_lib) +add_darling_static_library(unwind_static SOURCES ${libunwind_sources}) set_target_properties(unwind_static PROPERTIES COMPILE_FLAGS "-DNDEBUG=1") make_fat(unwind_static)