🍒[cxx-interop] Include Cxx and CxxStdlib modules in no-stdlib builds
#65065
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
These modules are shipped with the toolchain, while the stdlib might be built and shipped separately. rdar://107780733 (cherry picked from commit d95215d)
Cxx & CxxStdlib modules are Swift-only, they do not require invoking clang directly. When building with `SWIFT_INCLUDE_TOOLS=NO`, Clang is not available as a CMake target (see `swift_common_standalone_build_config`). rdar://107780733 (cherry picked from commit 14f3231)
|
@swift-ci please test |
zoecarver
approved these changes
Apr 11, 2023
This adds the ability to control the C++ interop module in the -stdlib build separately from "extra toolchain content". This is helpful for Windows where we bootstrap the entire toolchain and do not have a stdlib built when building tools. (cherry picked from commit 435d4b4)
|
@swift-ci please test |
rjmccall
approved these changes
Apr 13, 2023
airspeedswift
approved these changes
Apr 13, 2023
|
@swift-ci please test Linux |
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.
Explanation: This ensures that the
CxxandCxxStdlibbinaries are compiled and installed correctly when building the stdlib separately from the compiler. These two modules are shipped with the toolchain, not with the SDK, so they need to be built along with the compiler. This also removes the unnecessary dependency on clang for these two modules.Scope: Only affects clients which enable Swift/C++ interop.
Risk: Low: C++ interop is an opt-in feature that is enabled via a compiler flag. It is off by default.
rdar://107840627