1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <debian@fabian.gruenbichler.email>
Date: Sat, 11 Jan 2025 16:37:16 +0100
Subject: bootstrap: don't attempt to download rustc in tests
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
the tests use a default config, so we need to manually override this
option..
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
---
src/bootstrap/src/core/config/config.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index 678a9b6..bc8fcff 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -543,7 +543,7 @@ impl Config {
new_symbol_mangling: rust_new_symbol_mangling,
profile_generate: rust_profile_generate,
profile_use: rust_profile_use,
- download_rustc: rust_download_rustc,
+ download_rustc: mut rust_download_rustc,
lto: rust_lto,
validate_mir_opts: rust_validate_mir_opts,
frame_pointers: rust_frame_pointers,
@@ -657,6 +657,7 @@ impl Config {
// Cargo in their bootstrap.toml.
build_rustc = build_rustc.take().or(std::env::var_os("RUSTC").map(|p| p.into()));
build_cargo = build_cargo.take().or(std::env::var_os("CARGO").map(|p| p.into()));
+ rust_download_rustc = Some(StringOrBool::Bool(false));
}
if !flags_skip_stage0_validation {
|
