allow using null to unset an environment variable
#19629
Merged
+114
−91
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
rustbot
added
the
S-waiting-on-review
|
cc @davidbarsky for the DiscoverCommand changes; should cargo.extraEnv or check.extraEnv apply there? right now they don’t. |
this makes three changes: - all callsites of `toolchain::command` are changed to use `command(path, extra_env)`, instead of manually adding the env after the fact. - all `map<str, str>` are changed to `map<str, option<str>>`. - `command` checks for None and calls `env_remove` if so. this caught several places where environment variables weren't being propagated: - when running `rustc --print=target-libdir` - when running `cargo rustc -- --print=target-spec-json` - when running the custom DiscoverLinkedProjects config. I *think* this is for use with non-cargo build systems, so I didn't change it.
|
@jyn514 Sorry for the delay. I—weakly—don’t think that environment variables should apply to I think if we do want to add environment variable support to |
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.
this makes three changes:
toolchain::commandare changed to usecommand(path, extra_env), instead of manually adding the env after the fact.map<str, str>are changed tomap<str, option<str>>.commandchecks for None and callsenv_removeif so.this caught several places where environment variables weren't being propagated:
rustc --print=target-libdircargo rustc -- --print=target-spec-jsoni verified locally that this actually works.
fixes #19626