🍒[cxx-interop] Make CxxShim header and modulemap arch-independent #66807
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
This moves `libcxxshim.modulemap`, `libcxxshim.h` and `libcxxstdlibshim.h` from `*.xctoolchain/usr/lib/swift/macosx/arm64e` to `*.xctoolchain/usr/lib/swift/macosx` to simplify distribution. rdar://110788977 (cherry picked from commit 4ce4527)
|
@swift-ci please test |
DougGregor
approved these changes
Jun 22, 2023
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 moves
libcxxshim.modulemap,libcxxshim.handlibcxxstdlibshim.hfrom*.xctoolchain/usr/lib/swift/macosx/arm64eto*.xctoolchain/usr/lib/swift/macosxto simplify distribution.Scope: This simplifies the CMake build scripts to ignore the architecture for these headers, and adjusts the compiler logic used to discover the headers.
Risk: Medium, this alters the distribution of the toolchain headers.
rdar://110788977
(cherry picked from commit 4ce4527)