Rollup merge of #111538 - chenyukang:yukang-fix-110067-version-issue, r=jyn514

Make sure the build.rustc version is either the same or 1 apart

Fixes #110067
r? `@jyn514`
This commit is contained in:
Matthias Krüger 2023-05-15 17:12:45 +02:00 committed by GitHub
commit 9267843e72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 0 deletions

View File

@ -58,6 +58,7 @@ dependencies = [
"once_cell", "once_cell",
"opener", "opener",
"pretty_assertions", "pretty_assertions",
"semver",
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
@ -645,6 +646,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "semver"
version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.137" version = "1.0.137"

View File

@ -57,6 +57,7 @@ walkdir = "2"
sysinfo = { version = "0.26.0", optional = true } sysinfo = { version = "0.26.0", optional = true }
clap = { version = "4.2.4", default-features = false, features = ["std", "usage", "help", "derive", "error-context"] } clap = { version = "4.2.4", default-features = false, features = ["std", "usage", "help", "derive", "error-context"] }
clap_complete = "4.2.2" clap_complete = "4.2.2"
semver = "1.0.17"
# Solaris doesn't support flock() and thus fd-lock is not option now # Solaris doesn't support flock() and thus fd-lock is not option now
[target.'cfg(not(target_os = "solaris"))'.dependencies] [target.'cfg(not(target_os = "solaris"))'.dependencies]

View File

@ -24,6 +24,7 @@
use crate::flags::{Color, Flags, Warnings}; use crate::flags::{Color, Flags, Warnings};
use crate::util::{exe, output, t}; use crate::util::{exe, output, t};
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use semver::Version;
use serde::{Deserialize, Deserializer}; use serde::{Deserialize, Deserializer};
use serde_derive::Deserialize; use serde_derive::Deserialize;
@ -1019,6 +1020,7 @@ fn parse_inner<'a>(args: &[String], get_toml: impl 'a + Fn(&Path) -> TomlConfig)
config.download_beta_toolchain(); config.download_beta_toolchain();
config.out.join(config.build.triple).join("stage0/bin/rustc") config.out.join(config.build.triple).join("stage0/bin/rustc")
}); });
config.initial_cargo = build config.initial_cargo = build
.cargo .cargo
.map(|cargo| { .map(|cargo| {
@ -1680,6 +1682,42 @@ pub fn default_codegen_backend(&self) -> Option<Interned<String>> {
self.rust_codegen_backends.get(0).cloned() self.rust_codegen_backends.get(0).cloned()
} }
pub fn check_build_rustc_version(&self) {
if self.dry_run() {
return;
}
// check rustc version is same or lower with 1 apart from the building one
let mut cmd = Command::new(&self.initial_rustc);
cmd.arg("--version");
let rustc_output = output(&mut cmd)
.lines()
.next()
.unwrap()
.split(' ')
.nth(1)
.unwrap()
.split('-')
.next()
.unwrap()
.to_owned();
let rustc_version = Version::parse(&rustc_output.trim()).unwrap();
let source_version =
Version::parse(&fs::read_to_string(self.src.join("src/version")).unwrap().trim())
.unwrap();
if !(source_version == rustc_version
|| (source_version.major == rustc_version.major
&& source_version.minor == rustc_version.minor + 1))
{
let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
eprintln!(
"Unexpected rustc version: {}, we should use {}/{} to build source with {}",
rustc_version, prev_version, source_version, source_version
);
crate::detail_exit(1);
}
}
/// Returns the commit to download, or `None` if we shouldn't download CI artifacts. /// Returns the commit to download, or `None` if we shouldn't download CI artifacts.
fn download_ci_rustc_commit(&self, download_rustc: Option<StringOrBool>) -> Option<String> { fn download_ci_rustc_commit(&self, download_rustc: Option<StringOrBool>) -> Option<String> {
// If `download-rustc` is not set, default to rebuilding. // If `download-rustc` is not set, default to rebuilding.

View File

@ -414,6 +414,7 @@ pub fn new(mut config: Config) -> Build {
bootstrap_out.display() bootstrap_out.display()
) )
} }
config.check_build_rustc_version();
if rust_info.is_from_tarball() && config.description.is_none() { if rust_info.is_from_tarball() && config.description.is_none() {
config.description = Some("built from a source tarball".to_owned()); config.description = Some("built from a source tarball".to_owned());