[6.0][Macros] Add '-plugin-path' the the toolchain's plugins in Info.plist #74036
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
So Xcode always prefer the plugins in the toolchain to the SDK's. Since swift.org toolchains include stdlib, it wants to use the plugins in it. (cherry picked from commit faa5003)
|
@swift-ci Please test |
bnbarham
approved these changes
May 31, 2024
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.
Cherry-pick #74018 into release/6.0
@TaskLocalhas been changed to a macro, swift.org toolchains are not usable with build-systems with a swift-driver that doesn't include [6.0] Prefer toolchain's plugins to SDK plugins if the toolchain has stdlib swift-driver#1592, because the SDK's plugins precede the toolchain's. This PR avoid it by adding-plugin-path $(TOOLCHAIN_DIR)/usr/lib/swift/host/pluginsto theOTHER_SWIFT_FLAGS.