From 439597bc1b3cbf6c8ceec7c81ae0143baee2c329 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sun, 25 Sep 2022 10:23:33 -0400 Subject: [PATCH] Support overriding initial rustc and cargo paths This restores functionality broken by #98483. Unfortunately, it doesn't add a test to verify this works, but in this case we notice pretty quickly as perf uses this functionality and so reports breakage immediately after merging. --- src/bootstrap/config.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index a6333976f2ac2..74530dec97b70 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -901,9 +901,7 @@ impl Config { config.config = toml_path; let build = toml.build.unwrap_or_default(); - let has_custom_rustc = build.rustc.is_some(); - set(&mut config.initial_rustc, build.rustc.map(PathBuf::from)); set(&mut config.out, flags.build_dir.or_else(|| build.build_dir.map(PathBuf::from))); // NOTE: Bootstrap spawns various commands with different working directories. // To avoid writing to random places on the file system, `config.out` needs to be an absolute path. @@ -912,10 +910,14 @@ impl Config { config.out = crate::util::absolute(&config.out); } - if !has_custom_rustc && !config.initial_rustc.starts_with(&config.out) { - config.initial_rustc = config.out.join(config.build.triple).join("stage0/bin/rustc"); - config.initial_cargo = config.out.join(config.build.triple).join("stage0/bin/cargo"); - } + config.initial_rustc = build + .rustc + .map(PathBuf::from) + .unwrap_or_else(|| config.out.join(config.build.triple).join("stage0/bin/rustc")); + config.initial_cargo = build + .cargo + .map(PathBuf::from) + .unwrap_or_else(|| config.out.join(config.build.triple).join("stage0/bin/cargo")); // NOTE: it's important this comes *after* we set `initial_rustc` just above. if config.dry_run {