Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/rust/patches/rust-1.71.1-0005-bootstrap-Unbreak-building-Rust-1.71.1-with-1.71.0.patch

    Contents of /trunk/rust/patches/rust-1.71.1-0005-bootstrap-Unbreak-building-Rust-1.71.1-with-1.71.0.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3755 - (show annotations) (download)
    Sun Aug 6 10:48:54 2023 UTC (9 months, 2 weeks ago) by niro
    File size: 1265 byte(s) 
    -rust-1.71.1 archlinux patches
    1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2 From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
    3 Date: Fri, 4 Aug 2023 02:05:02 +0200
    4 Subject: [PATCH] bootstrap: Unbreak building Rust 1.71.1 with 1.71.0
    5
    6 See: https://github.com/rust-lang/rust/issues/114444
    7 ---
    8 src/bootstrap/config.rs | 6 +++---
    9 1 file changed, 3 insertions(+), 3 deletions(-)
    10
    11 diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
    12 index e192cda9a9a7..5721d8cf5bf6 100644
    13 --- a/src/bootstrap/config.rs
    14 +++ b/src/bootstrap/config.rs
    15 @@ -1803,9 +1803,9 @@ pub fn check_build_rustc_version(&self) {
    16 let source_version =
    17 Version::parse(&fs::read_to_string(self.src.join("src/version")).unwrap().trim())
    18 .unwrap();
    19 - if !(source_version == rustc_version
    20 - || (source_version.major == rustc_version.major
    21 - && source_version.minor == rustc_version.minor + 1))
    22 + if !(source_version.major == rustc_version.major
    23 + && (source_version.minor == rustc_version.minor
    24 + || source_version.minor == rustc_version.minor + 1))
    25 {
    26 let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
    27 eprintln!(