bootstrap: read config from $RUST_BOOTSTRAP_CONFIG #73317
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
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
This should adjust x.py (well, src/bootstrap/bootstrap.py) as well and likely entirely move the detection logic to there, exclusively relying on the environment variable in the Rust code. I would also like to see the environment variable renamed to something like Other than those two, this seems fine to add to me. |
davidtwco
force-pushed
the
bootstrap-config-env-var
branch
from
a3a2190 to
dd4bb50
Compare
davidtwco
changed the title
These should both be fixed now. |
This commit modifies bootstrap so that `config.toml` is read first from `RUST_BOOTSTRAP_CONFIG`, then `--config` and finally `config.toml` in the current directory. This is a subjective change, intended to improve the ergnomics when using "development shells" for rustc development (for example, using tools such as Nix) which set environment variables to ensure a reproducible environment (these development shells can then be version controlled). By optionally reading `config.toml` from an environment variable, a `config.toml` can be defined in the development shell and a path to it exposed in the `RUST_BOOTSTRAP_CONFIG` environment variable - avoiding the need to manually symlink the contents of this file to `config.toml` in the working directory. Signed-off-by: David Wood <david@davidtw.co>
davidtwco
force-pushed
the
bootstrap-config-env-var
branch
from
dd4bb50 to
93022be
Compare
|
@bors r+ |
|
📌 Commit 93022be has been approved by |
bors
added
S-waiting-on-bors
|
@bors rollup |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 19, 2020
Rollup of 10 pull requests Successful merges: - rust-lang#72280 (Fix up autoderef when reborrowing) - rust-lang#72785 (linker: MSVC supports linking static libraries as a whole archive) - rust-lang#73011 (first stage of implementing LLVM code coverage) - rust-lang#73044 (compiletest: Add directives to detect sanitizer support) - rust-lang#73054 (memory access sanity checks: abort instead of panic) - rust-lang#73136 (Change how compiler-builtins gets many CGUs) - rust-lang#73280 (Add E0763) - rust-lang#73317 (bootstrap: read config from $RUST_BOOTSTRAP_CONFIG) - rust-lang#73350 (bootstrap/install.rs: support a nonexistent `prefix` in `x.py install`) - rust-lang#73352 (Speed up bootstrap a little.) Failed merges: r? @ghost
davidtwco
added a commit
to davidtwco/rust
that referenced
this pull request
Jun 22, 2020
This commit fixes a regression introduced in rust-lang#73317 where an oversight meant that `config.toml` was assumed to exist. Signed-off-by: David Wood <david@davidtw.co>
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Jun 22, 2020
…var, r=Mark-Simulacrum bootstrap: no `config.toml` exists regression Fixes rust-lang#73574. This PR fixes a regression introduced in rust-lang#73317 where an oversight meant that `config.toml` was assumed to exist.
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Jun 23, 2020
…var, r=Mark-Simulacrum bootstrap: no `config.toml` exists regression Fixes rust-lang#73574. This PR fixes a regression introduced in rust-lang#73317 where an oversight meant that `config.toml` was assumed to exist.
davidtwco
added a commit
to davidtwco/veritas
that referenced
this pull request
Jun 23, 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.
This PR modifies bootstrap so that
config.tomlis read first fromRUST_BOOTSTRAP_CONFIG, then--configand finallyconfig.tomlin the current directory.This is a subjective change, intended to improve the ergnomics when using "development shells" for rustc development (for example, using tools such as Nix) which set environment variables to ensure a reproducible environment (these development shells can then be version controlled, e.g. my rustc shell). By optionally reading
config.tomlfrom an environment variable, aconfig.tomlcan be defined in the development shell and a path to it exposed in theRUST_BOOTSTRAP_CONFIGenvironment variable - avoiding the need to manually symlink the contents of this file toconfig.tomlin the working directory.