Skip to content

Commit f2ed6c5

Browse files
authored
Merge pull request #82582 from compnerd/62-builds
Runtimes: fix a couple of runtime build bugs
2 parents 2d06a61 + 0a34a1e commit f2ed6c5

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

Runtimes/Core/Concurrency/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ add_library(swift_Concurrency
102102

103103
include(${SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR}.cmake)
104104
target_compile_definitions(swift_Concurrency PRIVATE
105+
$<$<COMPILE_LANGUAGE:C,CXX>:-DSWIFT_RUNTIME>
105106
$<$<COMPILE_LANGUAGE:C,CXX>:-DSWIFT_TARGET_LIBRARY_NAME=swift_Concurrency>
106107
# NOTE: VS2017 <15.8 would round clamp alignment to alignof(max_align_t) which
107108
# was non-conformant. Indicate that we wish to use extended alignment.

Runtimes/Supplemental/StringProcessing/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ include(AvailabilityMacros)
2727
add_compile_options(
2828
$<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>
2929
$<$<COMPILE_LANGUAGE:Swift>:-nostdlibimport>
30+
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-concurrency-module-import>"
3031
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-string-processing-module-import>")
3132

3233
add_subdirectory(_RegexParser)

Runtimes/Supplemental/StringProcessing/_RegexParser/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ add_library(swift_RegexParser
3131
Utility/Errors.swift
3232
Utility/MissingUnicode.swift)
3333

34-
target_link_libraries(swift_RegexParser PRIVATE swiftCore)
34+
target_link_libraries(swift_RegexParser PRIVATE
35+
swiftCore)
3536

3637
set_target_properties(swift_RegexParser PROPERTIES
3738
Swift_MODULE_NAME _RegexParser)

0 commit comments

Comments
 (0)