Skip to content

Commit 5c31c10

Browse files
authored
Merge pull request #75566 from edymtt/edymtt/promote-concurrency-stringprocessing-to-core-libraries
Promote _Concurrency and StringProcessing to core subset of the stdlib
2 parents fd9a3c9 + 5512833 commit 5c31c10

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

stdlib/cmake/modules/StdlibOptions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ option(SWIFT_STDLIB_EMIT_API_DESCRIPTORS
101101

102102
option(SWIFT_STDLIB_BUILD_ONLY_CORE_MODULES
103103
"Build only the core subset of the standard library,
104-
ignoring additional libraries such as Concurrency, Distributed and StringProcessing.
104+
ignoring additional libraries such as Distributed, Observation and Synchronization.
105105
This is an option meant for internal configurations inside Apple
106106
that need to build the standard libraries in chunks when constructing an SDK"
107107
FALSE)

stdlib/public/CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,16 @@ if(SWIFT_BUILD_STDLIB)
269269
if(SWIFT_BUILD_CLANG_OVERLAYS)
270270
add_subdirectory(ClangOverlays)
271271
endif()
272+
273+
if(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY)
274+
add_subdirectory(Concurrency)
275+
endif()
276+
277+
if(SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING)
278+
add_subdirectory(RegexParser)
279+
add_subdirectory(StringProcessing)
280+
add_subdirectory(RegexBuilder)
281+
endif()
272282
endif()
273283

274284
if(SWIFT_BUILD_STDLIB AND NOT SWIFT_STDLIB_BUILD_ONLY_CORE_MODULES)
@@ -279,20 +289,10 @@ if(SWIFT_BUILD_STDLIB AND NOT SWIFT_STDLIB_BUILD_ONLY_CORE_MODULES)
279289
add_subdirectory(Differentiation)
280290
endif()
281291

282-
if(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY)
283-
add_subdirectory(Concurrency)
284-
endif()
285-
286292
if(SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED)
287293
add_subdirectory(Distributed)
288294
endif()
289295

290-
if(SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING)
291-
add_subdirectory(RegexParser)
292-
add_subdirectory(StringProcessing)
293-
add_subdirectory(RegexBuilder)
294-
endif()
295-
296296
if(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION)
297297
add_subdirectory(Observation)
298298
endif()

0 commit comments

Comments
 (0)