Skip to content

Commit fcb6ff5

Browse files
committed
fix rust bootstrap tests requiring a downloaded stage0
1 parent d3f1618 commit fcb6ff5

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

src/bootstrap/src/core/config/config.rs

+13-1
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,19 @@ impl Config {
11891189
pub fn parse(args: &[String]) -> Config {
11901190
#[cfg(test)]
11911191
fn get_toml(_: &Path) -> TomlConfig {
1192-
TomlConfig::default()
1192+
let mut default = TomlConfig::default();
1193+
1194+
// When configuring bootstrap for tests, make sure to set the rustc and Cargo to the
1195+
// same ones used to call the tests. If we don't do that, bootstrap will use its own
1196+
// detection logic to find a suitable rustc and Cargo, which doesn't work when the
1197+
// caller is specìfying a custom local rustc or Cargo in their config.toml.
1198+
default.build = Some(Build {
1199+
rustc: std::env::var_os("RUSTC").map(|v| v.into()),
1200+
cargo: std::env::var_os("CARGO").map(|v| v.into()),
1201+
..Build::default()
1202+
});
1203+
1204+
default
11931205
}
11941206

11951207
#[cfg(not(test))]

0 commit comments

Comments
 (0)