Allow a custom env for more xcrun invocations
#1770
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 |
|
We shouldn't put the env in UserToolchain instead of getClangCompiler() |
|
I was 🤔 about that, but decided that there might be a need to have a different environment for manifest parsing vs. building. I guess if someone really needs that customisability, they can create a custom |
neonichu
force-pushed
the
allow-environment-override-2
branch
from
35827d2 to
485e35e
Compare
|
@swift-ci please smoke test |
aciidgh
reviewed
Sep 5, 2018
| @@ -129,6 +129,8 @@ public final class UserToolchain: Toolchain { | |||
| return lookupExecutablePath(filename: getenv(variable), searchPaths: searchPaths) | |||
| } | |||
|
|
|||
| private let environment: [String:String] | |||
There was a problem hiding this comment.
nit: needs doc comment and space between : and String.
There was a problem hiding this comment.
should we call it processEnv maybe?
aciidgh
reviewed
Sep 5, 2018
| @@ -159,6 +161,7 @@ public final class UserToolchain: Toolchain { | |||
|
|
|||
| public init(destination: Destination, environment: [String:String] = Process.env) throws { | |||
There was a problem hiding this comment.
nit: /s/[String:String/[String: String]/
neonichu
force-pushed
the
allow-environment-override-2
branch
2 times, most recently
from
aa22715 to
0897e28
Compare
|
@swift-ci please smoke test |
Basically a continuation of swiftlang#1766
neonichu
force-pushed
the
allow-environment-override-2
branch
from
0897e28 to
aef1c45
Compare
|
@swift-ci please smoke test |
|
This should be good to merge 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.
Basically a continuation of #1766