Set PATH in the env when invoking dsymutil so it can find lipo in another toolchain #787
+46
−2
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
owenv
requested review from
aciidgh,
jakepetroules,
mirza-garibovic,
mhrawdon and
neonichu
as code owners
|
@swift-ci test |
neonichu
approved these changes
Sep 9, 2025
| public override func environmentFromSpec(_ cbc: CommandBuildContext, _ delegate: any DiagnosticProducingDelegate, lookup: ((MacroDeclaration) -> MacroExpression?)? = nil) -> [(String, String)] { | ||
| var env: [(String, String)] = super.environmentFromSpec(cbc, delegate, lookup: lookup) | ||
| // dsymutil may need to lookup lipo, which is not necessarily in the same toolchain. | ||
| env.append(("PATH", cbc.producer.executableSearchPaths.environmentRepresentation)) |
There was a problem hiding this comment.
I know this particular PR is about lipo but note that PATH is usually spelled Path on Windows -- this might be a good opportunity to switch out String for EnvironmentKey in a few more places, though I can understand if that's too far outside the scope of what you're aiming to fix right now.
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.
For example, on macOS dsymutil in a Swift.org toolchain may need to find lipo in the Xcode toolchain