diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2022-02-07 14:08:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-07 14:08:40 +0000 |
| commit | a6c48108ad2a5bbfb161818a047e4497dde0afea (patch) | |
| tree | a9b246b07598d36a2788fcb098b7a2ea657db80c /src | |
| parent | 0f9d3b4c21338abf19ff897ea67928423a8663ce (diff) | |
| parent | 95054de501ca1322694bf6378c105347c02a21aa (diff) | |
| download | rust-a6c48108ad2a5bbfb161818a047e4497dde0afea.tar.gz rust-a6c48108ad2a5bbfb161818a047e4497dde0afea.zip | |
Rollup merge of #93737 - mfrw:mfrw/bootstrap-config, r=Mark-Simulacrum
bootstrap: prefer using '--config' over 'RUST_BOOTSTRAP_CONFIG' Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com> Closes: #93725 Rleated: #92260
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 6d7ab15326c..86115a90294 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -1221,9 +1221,9 @@ def bootstrap(help_triggered): build.verbose = args.verbose build.clean = args.clean - # Read from `RUST_BOOTSTRAP_CONFIG`, then `--config`, then fallback to `config.toml` (if it + # Read from `--config`, then `RUST_BOOTSTRAP_CONFIG`, then fallback to `config.toml` (if it # exists). - toml_path = os.getenv('RUST_BOOTSTRAP_CONFIG') or args.config + toml_path = args.config or os.getenv('RUST_BOOTSTRAP_CONFIG') if not toml_path and os.path.exists('config.toml'): toml_path = 'config.toml' |