Separate CMake option for "build concurrency lib" and "import concurrency lib" #37686
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ency lib" The CMake option `SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY` was originally meant to imply that we should build the _Concurrency module, which it still does. However, to support minimal stdlib builds, it also became a way to configure the compiler to avoid implicitly importing the _Concurrency module. However, we build configurations of Swift where we want the implicit import but don't want to build the _Concurrency library. Use a new, different option (`SWIFT_IMPLICIT_CONCURRENCY_IMPORT`) for the "implicit import" behavior within the compiler, which defaults to "true", and disable that for minimal stdlib builds. Fixes rdar://78544947.
|
@swift-ci please test |
|
@davezarzycki will this work for the minimal stdlib for you? It helps with our build-the-compiler-without-the-extra-libraries builds. |
|
Build failed |
|
Seems reasonable to me. |
|
macOS test timed out but otherwise didn't fail. Dropping down to smoke tests |
|
@swift-ci please smoke test macOS |
This was referenced May 28, 2021
3405691582
added a commit
to 3405691582/swift
that referenced
this pull request
Jun 10, 2021
In swiftlang#37686 `SWIFT_IMPLICIT_CONCURRENCY_IMPORT` was introduced alongside the existing `SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY`, but the `#cmakedefine` for this preprocessor symbol was renamed to the former instead of a new `#cmakedefine` being introduced. This means the `#ifdef` conditional referred in this commit was broken. Instead of just introducing the old symbol back again, let's rename it as it probably was intended here. However, the semantics of this symbol is slightly different: this now requires prospective builders to explicitly turn this off on platforms where Dispatch is unavailable. To address this, the docs are updated to match. Caveat: I have not ran the procedure in the doc recently, but this hopefully should suffice to guide the reader until I get around to doing so.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The CMake option
SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCYwas originallymeant to imply that we should build the _Concurrency module, which it still
does. However, to support minimal stdlib builds, it also became a way
to configure the compiler to avoid implicitly importing the
_Concurrency module. However, we build configurations of Swift where
we want the implicit import but don't want to build the _Concurrency
library. Use a new, different option
(
SWIFT_IMPLICIT_CONCURRENCY_IMPORT) for the "implicit import"behavior within the compiler, which defaults to "true", and disable
that for minimal stdlib builds.
Fixes rdar://78544947.