mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
|
Date: Fri, 4 Aug 2023 02:05:02 +0200
|
|
Subject: [PATCH] bootstrap: Unbreak building Rust 1.71.1 with 1.71.0
|
|
|
|
See: https://github.com/rust-lang/rust/issues/114444
|
|
---
|
|
src/bootstrap/config.rs | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
|
|
index e192cda9a9a7..5721d8cf5bf6 100644
|
|
--- a/src/bootstrap/config.rs
|
|
+++ b/src/bootstrap/config.rs
|
|
@@ -1803,9 +1803,9 @@ pub fn check_build_rustc_version(&self) {
|
|
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))
|
|
+ if !(source_version.major == rustc_version.major
|
|
+ && (source_version.minor == rustc_version.minor
|
|
+ || source_version.minor == rustc_version.minor + 1))
|
|
{
|
|
let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
|
|
eprintln!(
|