about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2023-08-23 17:46:34 +0200
committerGitHub <noreply@github.com>2023-08-23 17:46:34 +0200
commitb3949c01746a8438f972cf05ac196bfd5565fea5 (patch)
tree393f1703a576aefc4f418c68dceabcca304ffb07
parentc9dbff2f4223552f32797e91772329a3a15735f2 (diff)
parent6aef5b331ffcb6816fb8900f5e2d87948e7cff84 (diff)
downloadrust-b3949c01746a8438f972cf05ac196bfd5565fea5.tar.gz
rust-b3949c01746a8438f972cf05ac196bfd5565fea5.zip
Rollup merge of #115103 - djkoloski:disable_bootstrap_version_check, r=compiler-errors
Disable bootstrap rustc version check

Mitigates #115065
-rw-r--r--src/bootstrap/config.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 4821d20a898..762e66ac7cc 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -1276,7 +1276,8 @@ impl Config {
         }
 
         config.initial_rustc = if let Some(rustc) = build.rustc {
-            config.check_build_rustc_version(&rustc);
+            // FIXME(#115065): re-enable this check
+            // config.check_build_rustc_version(&rustc);
             PathBuf::from(rustc)
         } else {
             config.download_beta_toolchain();