Merge pull request #37690 from DougGregor/minimal-stdlib-concurrency-fix-5.5

Author: DougGregor

CMakeLists.txt

@@ -403,8 +403,12 @@ option(SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING
   "Enable experimental Swift differentiable programming features"
   FALSE)
 
+option(SWIFT_IMPLICIT_CONCURRENCY_IMPORT
+  "Implicitly import the Swift concurrency module"
+  TRUE)
+
 option(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY
-  "Enable experimental Swift concurrency model"
+  "Enable build of the Swift concurrency module"
   FALSE)
 
 option(SWIFT_ENABLE_DISPATCH

include/swift/Basic/LangOptions.h

@@ -275,7 +275,7 @@ namespace swift {
 
     /// Disable the implicit import of the _Concurrency module.
     bool DisableImplicitConcurrencyModuleImport =
-        !SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY;
+        !SWIFT_IMPLICIT_CONCURRENCY_IMPORT;
 
     /// Should we check the target OSs of serialized modules to see that they're
     /// new enough?

include/swift/Config.h.in

@@ -8,6 +8,6 @@
 
 #cmakedefine HAVE_PROC_PID_RUSAGE 1
 
-#cmakedefine01 SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY
+#cmakedefine01 SWIFT_IMPLICIT_CONCURRENCY_IMPORT
 
 #endif // SWIFT_CONFIG_H

utils/build-presets.ini

@@ -2395,7 +2395,7 @@ swift-enable-compatibility-overrides=0
 swift-runtime-macho-no-dyld=1
 swift-stdlib-single-threaded-runtime=1
 swift-stdlib-os-versioning=0
-extra-cmake-options=-DSWIFT_ENABLE_DISPATCH:BOOL=FALSE
+extra-cmake-options=-DSWIFT_ENABLE_DISPATCH:BOOL=FALSE -DSWIFT_IMPLICIT_CONCURRENCY_IMPORT:BOOL=FALSE
 
 [preset: stdlib_S_standalone_minimal_macho_x86_64,build]
 mixin-preset=