From 053afe4907fa7ac7ff6d08d42583bde9a4d4414c Mon Sep 17 00:00:00 2001 From: flip1995 Date: Sat, 2 Jan 2021 18:01:42 +0100 Subject: [PATCH] Use bootstrap rustc for versioncheck in Clippy --- tests/versioncheck.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/versioncheck.rs b/tests/versioncheck.rs index 589b19f68f7..76b6126c76c 100644 --- a/tests/versioncheck.rs +++ b/tests/versioncheck.rs @@ -28,10 +28,11 @@ fn check_that_clippy_has_the_same_major_version_as_rustc() { let clippy_minor = clippy_version.minor; let clippy_patch = clippy_version.patch; - // get the rustc version - // this way the rust-toolchain file version is honored + // get the rustc version either from the rustc installed with the toolchain file or from + // `RUSTC_REAL` if Clippy is build in the Rust repo with `./x.py`. + let rustc = std::env::var("RUSTC_REAL").unwrap_or_else(|_| "rustc".to_string()); let rustc_version = String::from_utf8( - std::process::Command::new("rustc") + std::process::Command::new(&rustc) .arg("--version") .output() .expect("failed to run `rustc --version`")