Skip to content

Commit 72bf852

Browse files
committed
Build Runtime in macOS PR testing
For this to work, add the dependency on Darwin and start building the Cxx Interop libraries. Addresses rdar://160774928
1 parent 1ae8ef0 commit 72bf852

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1700,7 +1700,8 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
17001700
-DCMAKE_CXX_COMPILER_TARGET:STRING=${stdlib_target_triple}
17011701
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
17021702
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
1703-
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE)
1703+
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE
1704+
-DSwiftOverlay_ENABLE_CXX_INTEROP=TRUE)
17041705

17051706
ExternalProject_Add("${stdlib_target}-Supplemental"
17061707
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Runtimes/Supplemental"
@@ -1711,7 +1712,7 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
17111712
# To ensure incremental builds work as expected
17121713
BUILD_ALWAYS 1
17131714
CMAKE_ARGS
1714-
-DSwift_ENABLE_RUNTIMES=StringProcessing|Synchronization|Distributed|Observation
1715+
-DSwift_ENABLE_RUNTIMES=StringProcessing|Synchronization|Distributed|Observation|Runtime
17151716
-DBUILD_SHARED_LIBS=YES
17161717
-DCMAKE_Swift_COMPILER_WORKS:BOOLEAN=YES
17171718
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -1722,6 +1723,7 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
17221723
-DCMAKE_Swift_COMPILER_TARGET:STRING=${stdlib_target_triple}
17231724
-DCMAKE_C_COMPILER_TARGET:STRING=${stdlib_target_triple}
17241725
-DCMAKE_CXX_COMPILER_TARGET:STRING=${stdlib_target_triple}
1726+
-DCMAKE_ASM_COMPILER_TARGET:STRING=${stdlib_target_triple}
17251727
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
17261728
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
17271729
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE)

Runtimes/Supplemental/Runtime/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ set(${PROJECT_NAME}_VENDOR_MODULE_DIR "${CMAKE_SOURCE_DIR}/../cmake/modules/vend
4343

4444
find_package(SwiftCore REQUIRED)
4545
find_package(SwiftOverlay REQUIRED)
46-
#find_package(SwiftDarwin)
46+
find_package(SwiftDarwin)
4747

4848
include(GNUInstallDirs)
4949

@@ -154,7 +154,7 @@ target_link_libraries(swiftRuntime PRIVATE
154154
swift_Concurrency
155155
swiftCxxStdlib
156156
$<$<PLATFORM_ID:Android>:swiftAndroid>
157-
#$<$<PLATFORM_ID:Darwin>:swiftDarwin>
157+
$<$<PLATFORM_ID:Darwin>:swiftDarwin>
158158
$<$<PLATFORM_ID:Linux>:swiftGlibc>
159159
$<$<PLATFORM_ID:Windows>:swiftWinSDK>)
160160

0 commit comments

Comments
 (0)