rust-1.90.0

2025-09-23 12:34:33 +03:00
parent 7d890fb505
commit ae7f11ce2e
5 changed files with 78 additions and 10 deletions
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Thu, 7 Aug 2025 19:01:26 +0200
+Subject: [PATCH] bootstrap: Workaround for system stage0
+
+See: https://github.com/rust-lang/rust/issues/143735
+---
+ src/bootstrap/src/core/build_steps/compile.rs | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
+index 30cbcc05c429..0b5f1b55a43e 100644
+--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
+@@ -796,7 +796,10 @@ fn run(self, builder: &Builder<'_>) {
+                 let _ = fs::remove_dir_all(sysroot.join("lib/rustlib/src/rust"));
+             }
+ 
+-            builder.cp_link_r(&builder.initial_sysroot.join("lib"), &sysroot.join("lib"));
+            builder.cp_link_r(
+                &builder.initial_sysroot.join("lib/rustlib"),
+                &sysroot.join("lib/rustlib"),
+            );
+         } else {
+             if builder.download_rustc() {
+                 // Ensure there are no CI-rustc std artifacts.
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Fri, 19 Sep 2025 17:42:45 +0200
+Subject: [PATCH] bootstrap: Workaround for 1.90.0 stage0
+
+See: https://github.com/rust-lang/rust/issues/143765
+---
+ src/bootstrap/src/utils/helpers.rs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/bootstrap/src/utils/helpers.rs b/src/bootstrap/src/utils/helpers.rs
+index eb00ed566c2d..86b3358a22b7 100644
+--- a/src/bootstrap/src/utils/helpers.rs
+++ b/src/bootstrap/src/utils/helpers.rs
+@@ -430,17 +430,17 @@ pub fn linker_flags(
+                 // cfg(bootstrap) - remove the stage 0 check after updating the bootstrap compiler:
+                 // `-Clinker-features` has been stabilized.
+                 if stage == 0 {
+-                    args.push("-Zlinker-features=+lld".to_string());
+                    args.push("-Clinker-features=+lld".to_string());
+                 } else {
+                     args.push("-Clinker-features=+lld".to_string());
+                 }
+                 args.push("-Zunstable-options".to_string());
+             }
+             LldMode::SelfContained => {
+                 // cfg(bootstrap) - remove the stage 0 check after updating the bootstrap compiler:
+                 // `-Clinker-features` has been stabilized.
+                 if stage == 0 {
+-                    args.push("-Zlinker-features=+lld".to_string());
+                    args.push("-Clinker-features=+lld".to_string());
+                 } else {
+                     args.push("-Clinker-features=+lld".to_string());
+                 }
@@ -1,6 +1,8 @@
 profile = "user"
 # changelog-seen = 2

+change-id = 144675
+
 [llvm]
 link-shared = true

@@ -30,6 +32,7 @@ rpath = false

 lld = false
 use-lld = "external"
+llvm-bitcode-linker = false

 # backtrace-on-ice = true