From: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Date: Sat, 11 Jan 2025 15:37:16 +0000 (+0100)
Subject: bootstrap: don't attempt to download rustc in tests
X-Git-Tag: archive/raspbian/1.91.1+dfsg1-1+rpi1~1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3c2adee1e9ad85647f5fe0c7218381b8d1047704;p=rustc.git

bootstrap: don't attempt to download rustc in tests

the tests use a default config, so we need to manually override this
option..

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

Gbp-Pq: Topic build
Gbp-Pq: Name bootstrap-don-t-attempt-to-download-rustc-in-tests.patch
---

diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index 678a9b6395..bc8fcff69e 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 {