Skip to content

Commit e42cd50

Browse files
authored
Merge pull request #80298 from compnerd/wiring
Runtimes: allow building the Overlay against SwiftCore
2 parents 86bfe3a + 78ed9ad commit e42cd50

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

Runtimes/Overlay/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ project(SwiftOverlay
2222
LANGUAGES C CXX Swift
2323
VERSION 6.1.0${BUILD_NUMBER})
2424

25+
find_package(SwiftCore)
26+
2527
# FIXME: We should not need to refer back into the compiler sources. This is
2628
# needed by gyb and AvailabilityMacros
2729
set(SwiftOverlay_SWIFTC_SOURCE_DIR

Runtimes/Overlay/Windows/CRT/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ target_compile_definitions(swiftCRT PRIVATE
1313
$<$<BOOL:${SwiftOverlay_ENABLE_REFLECTION}>:SWIFT_ENABLE_REFLECTION>)
1414
target_compile_options(swiftCRT PRIVATE
1515
"SHELL:-Xcc -D_USE_MATH_DEFINES")
16+
target_link_libraries(swiftCRT PRIVATE
17+
swiftCore)
1618

1719
install(TARGETS swiftCRT
1820
ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"

Runtimes/Overlay/Windows/WinSDK/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set_target_properties(swiftWinSDK PROPERTIES
55
Swift_MODULE_NAME WinSDK)
66
target_compile_definitions(swiftCRT PRIVATE
77
$<$<BOOL:${SwiftOverlay_ENABLE_REFLECTION}>:SWIFT_ENABLE_REFLECTION>)
8+
target_link_libraries(swiftWinSDK PRIVATE
9+
swiftCore)
810

911
install(TARGETS swiftWinSDK
1012
ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"

Runtimes/Overlay/clang/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ set_target_properties(swift_Builtin_float PROPERTIES
88
Swift_MODULE_NAME _Builtin_float)
99
target_compile_options(swift_Builtin_float PRIVATE
1010
"$<$<PLATFORM_ID:Darwin>:SHELL:-Xfrontend -module-abi-name -Xfrontend Darwin>")
11+
target_link_libraries(swift_Builtin_float PRIVATE
12+
swiftCore)
1113

1214
install(TARGETS swift_Builtin_float
1315
ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"

0 commit comments

Comments
 (0)