Reapply "Infer object format when it can't be determined from a triple's successfully parsed environment #208
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
… a triple's successfully parsed environment""
owenv
force-pushed
the
revert-203-revert-201-object-format-fix
branch
from
8084737 to
8179c27
Compare
DougGregor
approved these changes
Aug 15, 2020
…ory than the driver
owenv
commented
Aug 16, 2020
Comment on lines
+131
to
+137
| } else if !["swift-frontend", "swift"].contains(executable), | ||
| let parentDirectory = try? getToolPath(.swiftCompiler).parentDirectory, | ||
| parentDirectory != executableDir, | ||
| let path = lookupExecutablePath(filename: executable, searchPaths: [parentDirectory]) { | ||
| // If the driver library's client and the frontend are in different directories, | ||
| // try looking for tools next to the frontend. | ||
| return path |
There was a problem hiding this comment.
This is kind of a hack, not sure if there's a better way to solve this that doesn't involve overriding the path to every toolchain tool individually
|
With swiftlang/swift-package-manager#2871, this now passes SPM CI testing @swift-ci test |
|
With the SPM change merged, this should be safe to reapply so long as swift-driver tests still pass @swift-ci test |
|
@swift-ci 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.
Testing another potential fix - If a tool can't be found relative to the driver library's client executable, look for it relative to the frontend instead