bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

bootstrap: read config from $RUST_BOOTSTRAP_CONFIG

Browse source 
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>
This commit is contained in:
David Wood 2020-06-13 17:04:06 +01:00
parent 1fb612bd15
commit 93022be991
No known key found for this signature in database
GPG key ID: 2592E76C87381FD9
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/bootstrap/bootstrap.py
View file

@ -894,7 +894,7 @@ def bootstrap(help_triggered):
build.clean = args.clean
try:
toml_path = args.config or 'config.toml'
toml_path = os.getenv('RUST_BOOTSTRAP_CONFIG') or args.config or 'config.toml'
if not os.path.exists(toml_path):
toml_path = os.path.join(build.rust_root, toml_path)
@ -947,6 +947,7 @@ def bootstrap(help_triggered):
env["SRC"] = build.rust_root
env["BOOTSTRAP_PARENT_ID"] = str(os.getpid())
env["BOOTSTRAP_PYTHON"] = sys.executable
env["BOOTSTRAP_CONFIG"] = toml_path
env["BUILD_DIR"] = build.build_dir
env["RUSTC_BOOTSTRAP"] = '1'
env["CARGO"] = build.cargo()