[Darwin] Add external plugin paths into platform specified by PLATFORM_DIR #1726
Conversation
This file contains 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
…M_DIR The driver currently has logic to infer the location of the platform based on the conventional layout of SDKs within platforms. However, that doesn't work well when SDKs have been built up in other places. Introduce support for a second convention, that the PLATFORM_DIR environment variable can specify the path to the platform. When present, also add external plugin paths pointing into that platform. Fixes rdar://138370421.
|
@swift-ci please test |
artemcm
approved these changes
Nov 6, 2024
rintaro
reviewed
Nov 6, 2024
Comment on lines
468
to
476
| // If the PLATFORM_DIR environment variable is set, also add plugin | ||
| // paths into it. | ||
| if let platformDir = env["PLATFORM_DIR"], | ||
| let platformPath = try? VirtualPath(path: platformDir) { | ||
| addPluginPaths( | ||
| forPlatform: platformPath, | ||
| commandLine: &commandLine | ||
| ) | ||
| } |
There was a problem hiding this comment.
I think env["PLATFORM_DIR"] based paths should precedes the SDK path based paths.
If there are plugins with the same name in the both directories, earlier -external-plugin-path option takes the precedence.
There was a problem hiding this comment.
Good point, I've moved it first
Since PLATFORM_DIR is the override, put it before the default-derived path.
|
@swift-ci please test |
|
@swift-ci please test Windows |
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 driver currently has logic to infer the location of the platform based on the conventional layout of SDKs within platforms. However, that doesn't work well when SDKs have been built up in other places.
Introduce support for a second convention, that the PLATFORM_DIR environment variable can specify the path to the platform. When present, also add external plugin paths pointing into that platform.
Fixes rdar://138370421.