diff --git a/CMakeLists.txt b/CMakeLists.txt index 9eb5c044bf96f..246db6a560bdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1711,7 +1711,7 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD) # To ensure incremental builds work as expected BUILD_ALWAYS 1 CMAKE_ARGS - -DSwift_ENABLE_RUNTIMES=StringProcessing|Synchronization|Distributed|Observation + -DSwift_ENABLE_RUNTIMES=StringProcessing|Synchronization|Distributed|Observation|Runtime -DBUILD_SHARED_LIBS=YES -DCMAKE_Swift_COMPILER_WORKS:BOOLEAN=YES -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} @@ -1722,6 +1722,7 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD) -DCMAKE_Swift_COMPILER_TARGET:STRING=${stdlib_target_triple} -DCMAKE_C_COMPILER_TARGET:STRING=${stdlib_target_triple} -DCMAKE_CXX_COMPILER_TARGET:STRING=${stdlib_target_triple} + -DCMAKE_ASM_COMPILER_TARGET:STRING=${stdlib_target_triple} -DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS} -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE) diff --git a/Runtimes/Supplemental/Runtime/CMakeLists.txt b/Runtimes/Supplemental/Runtime/CMakeLists.txt index 099fa4945bea2..52e061a46a26c 100644 --- a/Runtimes/Supplemental/Runtime/CMakeLists.txt +++ b/Runtimes/Supplemental/Runtime/CMakeLists.txt @@ -43,7 +43,7 @@ set(${PROJECT_NAME}_VENDOR_MODULE_DIR "${CMAKE_SOURCE_DIR}/../cmake/modules/vend find_package(SwiftCore REQUIRED) find_package(SwiftOverlay REQUIRED) -#find_package(SwiftDarwin) +find_package(SwiftDarwin) include(GNUInstallDirs) @@ -154,7 +154,7 @@ target_link_libraries(swiftRuntime PRIVATE swift_Concurrency swiftCxxStdlib $<$:swiftAndroid> - #$<$:swiftDarwin> + $<$:swiftDarwin> $<$:swiftGlibc> $<$:swiftWinSDK>)