Wasm/WASI: propagate PATH to UserToolchain to fix sysroot search #2936
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
# Conflicts: # Sources/Workspace/UserToolchain.swift
This comment has been minimized.
This comment has been minimized.
MaxDesiatov
force-pushed
the
wasi-toolchain-path
branch
from
d1948f5 to
47b8e0f
Compare
This comment has been minimized.
This comment has been minimized.
MaxDesiatov
force-pushed
the
wasi-toolchain-path
branch
from
47b8e0f to
7d79801
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
MaxDesiatov
requested review from
abertelrud,
aciidgh,
friedbunny and
neonichu
as code owners
78 tasks
neonichu
reviewed
Sep 18, 2020
| @@ -264,23 +270,22 @@ public final class UserToolchain: Toolchain { | |||
| + destination.extraSwiftCFlags | |||
| } | |||
|
|
|||
| public init(destination: Destination, environment: [String: String] = ProcessEnv.vars) throws { | |||
There was a problem hiding this comment.
I think we should retain the possibility to pass in a custom environment here.
There was a problem hiding this comment.
Thanks for pointing it out, I've reverted that part of the change.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
@swift-ci please smoke test |
neonichu
approved these changes
Sep 24, 2020
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Currently, when building for WASI, our users need to provide a
destination.jsonfile that contains a WASI sysroot path. It would be great if the sysroot path could be inferred automatically from PATH, when the appropriate WASI triple is requested as the destination platform. With this PR it's enough to pass--triple wasm32-unknown-wasitoswift buildto build for WASI.Unused private
processEnvironmentproperty ofUserToolchainis removed.(cc @kateinoigakukun)