[Driver] Derive '-external-plugin-path' #65473
Merged
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
|
@swift-ci Please smoke test |
rintaro
commented
Apr 27, 2023
| @@ -377,8 +377,6 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI, | |||
| } | |||
|
|
|||
| // Add plugin path options. | |||
| inputArgs.AddAllArgs(arguments, options::OPT_plugin_path); | |||
|
|
|||
There was a problem hiding this comment.
There is the same line above (line 239). This was just duplicating -plugin-path
|
@swift-ci Please Build Toolchain macOS Platform |
bnbarham
reviewed
May 4, 2023
lib/Driver/DarwinToolChains.cpp
Outdated
| static bool findCurrentSelectedXcodeDir(llvm::SmallVectorImpl<char> &path) { | ||
| assert(path.empty()); | ||
|
|
||
| auto xcrunPath = llvm::sys::findProgramByName("xcode-select"); |
lib/Driver/DarwinToolChains.cpp
Outdated
|
|
||
| auto xcrunPath = llvm::sys::findProgramByName("xcrun"); | ||
| if (!xcrunPath.getError()) { | ||
| // Explicitly ask for the default toolchain so that we don't find a Clang |
lib/Driver/DarwinToolChains.cpp
Outdated
Comment on lines
249
to
250
| // Explicitly ask for the default toolchain so that we don't find a Clang | ||
| // included with an open-source toolchain. |
There was a problem hiding this comment.
Comment doesn't apply here, we're just doing a xcode-select -p
lib/Driver/DarwinToolChains.cpp
Outdated
| path::remove_filename(xcodePluginPath); // 'bin' | ||
| path::append(xcodePluginPath, "lib", "swift", "host", "plugins"); | ||
|
|
||
| // '${toolchain}/usr/locallib/swift/host/plugins' |
rintaro
force-pushed
the
driver-external-plugin-path-rdar108624128
branch
from
3d8b9c9 to
b3024df
Compare
When the current toolchain is not a Xcode toolchain, derive '-external-plugin-path' poinintng Xcode plugins paths, so we can use plugins in Xcode. rdar://108624128
rintaro
force-pushed
the
driver-external-plugin-path-rdar108624128
branch
from
b3024df to
b0f5c39
Compare
|
@swift-ci Please smoke test |
bnbarham
approved these changes
May 4, 2023
|
@swift-ci Please smoke test |
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.
(libDriver changes corresponding to swiftlang/swift-driver#1320)
When the current toolchain is not a Xcode toolchain, derive '-external-plugin-path' poinintng Xcode plugins paths, so we can use plugins in Xcode.
rdar://108624128