[cmake] Include StdlibOptions when only building toolchain extras. #41942
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
In swiftlang#40610 some options were moved into `StdlibOptions.cmake`, but that file is only included from `stdlib/CMakeLists.txt` and `cmake/modules/StandaloneOverlay.cmake`. However, if one does not build neither the dynamic nor the static standard library, but enables building the "toolchain extras" with `SWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT` `stdlib/CMakeLists.txt` will not be included, but `stdlib/toolchain/CMakeLists.txt` will, which uses a value from `StandardOverlay.cmake` that will not be provided the correct default value and will skip building most of what `SWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT` used to do.
|
An alternative solution might be replicating what #39816 did for other variable. It can also happen that some other directory from https://github.com/apple/swift/blob/5fbd9b425402e9a66eda69c465e4673bfabfb3bb/CMakeLists.txt#L1107-L1122 uses those variables (directly or indirectly) and needs a similar fix to this. I haven't found those problems, so I did not change those directories. |
|
@swift-ci please test |
compnerd
approved these changes
Mar 22, 2022
|
@swift-ci please test Windows platform |
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.
In #40610 some options were moved into
StdlibOptions.cmake, but thatfile is only included from
stdlib/CMakeLists.txtandcmake/modules/StandaloneOverlay.cmake. However, if one does not buildneither the dynamic nor the static standard library, but enables
building the "toolchain extras" with
SWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENTstdlib/CMakeLists.txtwill not be included, but
stdlib/toolchain/CMakeLists.txtwill, whichuses a value from
StandardOverlay.cmakethat will not be provided thecorrect default value and will skip building most of what
SWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENTused to do.