Skip to content

Commit a6c4810

Browse files
authored
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
2 parents 0f9d3b4 + 95054de commit a6c4810

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/bootstrap/bootstrap.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1221,9 +1221,9 @@ def bootstrap(help_triggered):
12211221
build.verbose = args.verbose
12221222
build.clean = args.clean
12231223

1224-
# Read from `RUST_BOOTSTRAP_CONFIG`, then `--config`, then fallback to `config.toml` (if it
1224+
# Read from `--config`, then `RUST_BOOTSTRAP_CONFIG`, then fallback to `config.toml` (if it
12251225
# exists).
1226-
toml_path = os.getenv('RUST_BOOTSTRAP_CONFIG') or args.config
1226+
toml_path = args.config or os.getenv('RUST_BOOTSTRAP_CONFIG')
12271227
if not toml_path and os.path.exists('config.toml'):
12281228
toml_path = 'config.toml'
12291229

0 commit comments

Comments
 (0)