Skip to content

Separate CMake option for "build concurrency lib" and "import concurrency implicitly" #37698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2021
Merged

Separate CMake option for "build concurrency lib" and "import concurrency implicitly" #37698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/swift/Basic/LangOptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion include/swift/Config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

#cmakedefine HAVE_PROC_PID_RUSAGE 1

#cmakedefine01 SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY
#cmakedefine01 SWIFT_IMPLICIT_CONCURRENCY_IMPORT

#endif // SWIFT_CONFIG_H
2 changes: 1 addition & 1 deletion utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down