[cxx-interop] Install swift/bridging header in a different location
#72154
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
The recent Clang compiler change makes `-fno-modulemap-allow-subdirectory-search` the default behavior. This means that projects that use C++ interop and `#include <swift/bridging>` no longer compile, since Clang won't search for the SwiftBridging module under `usr/include/swift` anymore. This change moves the header to `usr/include/SwiftBridging`. The directory name matches the Clang module name, which will help Clang find this header along with the modulemap. rdar://123334601
|
@swift-ci please smoke test |
|
Let me test it on an actual project. |
Ok, with SwiftBridging it works on a test project. |
vsapsai
approved these changes
Mar 8, 2024
There was a problem hiding this comment.
As far as I can tell, the change is correct (though I'm not a CMake expert). What I really don't know is if some other CMakeLists.txt files need to be updated too. I usually deal with that through the trial-and-error.
As for migrating existing code from "swift/bridging" to "SwiftBridging/bridging" I have no opinion. At least I believe it is possible to support both versions with
#if __has_include(<SwiftBridging/bridging>)
# include <SwiftBridging/bridging>
#else
# include <swift/bridging>
#endif
|
Hmm, I think we don't actually want to change the user-facing path of the header ( |
|
Trying out another approach: #72186 |
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 recent Clang compiler change makes
-fno-modulemap-allow-subdirectory-searchthe default behavior. This means that projects that use C++ interop and#include <swift/bridging>no longer compile, since Clang won't search for the SwiftBridging module underusr/include/swiftanymore.This change moves the header to
usr/include/SwiftBridging. The directory name matches the Clang module name, which will help Clang find this header along with the modulemap.rdar://123334601