Add SDK and platform paths to plugin executables #1377
Merged
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
|
@swift-ci please test |
artemcm
approved these changes
Jun 15, 2023
bnbarham
reviewed
Jun 15, 2023
| // Given a virtual path pointing into a toolchain/SDK/platform, produce the | ||
| // path to `swift-plugin-server`. | ||
| fileprivate var pluginServerPath: VirtualPath { | ||
| self.appending(components: "usr", "swift-plugin-server") |
There was a problem hiding this comment.
Though seems like the rest don't have usr, so is this actually intended to be bin?
EDIT: Yeah, the root path below is "Developer", "usr" so I assume this should be bin.
There was a problem hiding this comment.
You're absolutely right.
bnbarham
reviewed
Jun 15, 2023
| return | ||
| } | ||
|
|
||
| let jobs = try driver.planBuild().removingAutolinkExtractJobs() | ||
| XCTAssertEqual(jobs.count, 1) | ||
| let job = jobs.first! | ||
| XCTAssertTrue(job.commandLine.contains(.flag("-external-plugin-path"))) |
There was a problem hiding this comment.
Might be worth checking the path here 😅
rintaro
reviewed
Jun 15, 2023
| if isFrontendArgSupported(.pluginPath) { | ||
| // Emit user-provided plugin paths, in order. | ||
| if isFrontendArgSupported(.externalPluginPath) { | ||
| try commandLine.appendAll(.pluginPath, .externalPluginPath, from: &parsedOptions) |
There was a problem hiding this comment.
Aren't we passing load-plugin-library and load-plugin-executable? 🤔
There was a problem hiding this comment.
I think those also need to be handled in this same group, yes.
There was a problem hiding this comment.
Woah, those aren't being passed at all!
Improve on the prior implementation of adding SDK and platform external plugin path arguments in a few ways: * Only do this for Darwin, because other platforms don't have similar abstractions at the moment * Fix incorrect paths, because I had not written tests * Add tests, because otherwise nobody should trust this code * Make sure all of the command-line arguments for compiler plugins are passed through to the frontend in the order they were provided * Pass `-load-plugin-library` and `-load-plugin-executable` through to the frontend
|
@swift-ci please test |
|
@swift-ci please test Windows |
rintaro
approved these changes
Jun 15, 2023
DougGregor
added a commit
to DougGregor/swift
that referenced
this pull request
Jun 16, 2023
Corresponding to swiftlang/swift-driver#1377, this adds some default plugin paths for Darwin SDKs and platforms. Fixes rdar://110819604.
DougGregor
added a commit
to DougGregor/swift
that referenced
this pull request
Jun 16, 2023
Corresponding to swiftlang/swift-driver#1377, this adds some default plugin paths for Darwin SDKs and platforms. Fixes rdar://110819604.
DougGregor
added a commit
to DougGregor/swift
that referenced
this pull request
Jun 16, 2023
Corresponding to swiftlang/swift-driver#1377, this adds some default plugin paths for Darwin SDKs and platforms. Fixes rdar://110819604.
DougGregor
added a commit
to DougGregor/swift
that referenced
this pull request
Jun 16, 2023
Corresponding to swiftlang/swift-driver#1377, this adds some default plugin paths for Darwin SDKs and platforms. Fixes rdar://110819604.
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.
No description provided.