Update to Rust 1.84.1

This commit is contained in:
Josh Stone 2025-01-30 12:00:33 -08:00
commit 8e04e725bb
4 changed files with 5 additions and 33 deletions

1
.gitignore vendored
View file

@ -447,3 +447,4 @@
/rustc-1.83.0-src.tar.xz
/rustc-1.84.0-src.tar.xz
/wasi-libc-wasi-sdk-25.tar.gz
/rustc-1.84.1-src.tar.xz

View file

@ -1,25 +0,0 @@
From 4c6d793c66993a0f5455f35e73a1549d232c3ae5 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 12 Dec 2024 17:06:03 -0800
Subject: [PATCH] Only dist `llvm-objcopy` if llvm tools are enabled
---
src/bootstrap/src/core/build_steps/dist.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 0c739115165e..89b2d73f74a8 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -471,7 +471,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
}
}
- {
+ if builder.config.llvm_enabled(compiler.host) && builder.config.llvm_tools_enabled {
let src_dir = builder.sysroot_target_bindir(compiler, host);
let llvm_objcopy = exe("llvm-objcopy", compiler.host);
let rust_objcopy = exe("rust-objcopy", compiler.host);
--
2.47.1

View file

@ -1,5 +1,5 @@
Name: rust
Version: 1.84.0
Version: 1.84.1
Release: %autorelease
Summary: The Rust Programming Language
License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-DFS-2016)
@ -139,11 +139,8 @@ Patch5: 0002-set-an-external-library-path-for-wasm32-wasi.patch
# We don't want to use the bundled library in libsqlite3-sys
Patch6: rustc-1.84.0-unbundle-sqlite.patch
# https://github.com/rust-lang/rust/pull/134240
Patch7: 0001-Only-dist-llvm-objcopy-if-llvm-tools-are-enabled.patch
# https://github.com/rust-lang/cc-rs/issues/1354
Patch8: 0001-Only-translate-profile-flags-for-Clang.patch
Patch7: 0001-Only-translate-profile-flags-for-Clang.patch
### RHEL-specific patches below ###
@ -674,8 +671,7 @@ rm -rf %{wasi_libc_dir}/dlmalloc/
%if %without bundled_sqlite3
%patch -P6 -p1
%endif
%patch -P7 -p1
%patch -P8 -p1 -d vendor/cc-1.2.5
%patch -P7 -p1 -d vendor/cc-1.2.5
%if %with disabled_libssh2
%patch -P100 -p1

View file

@ -1,2 +1,2 @@
SHA512 (rustc-1.84.0-src.tar.xz) = 9e964c1b964e74083a9002fa04b072fa8fe7a520b24ad55e88a89bb2a2a2cd5727c5438d6db425b824ae7502ab215c2dd3f49777efd65f76bae09965df2e070a
SHA512 (rustc-1.84.1-src.tar.xz) = f1cc4765736551508408126e44086988e8ddc30c1a929bf7b61c6be85ad0d65928dd5fb1041cfaeee8eb37d2208f2c1917e276aef2bc9a8e40e34f6713b349e1
SHA512 (wasi-libc-wasi-sdk-25.tar.gz) = 580716fbc152be19e2e9724f3483a0a580a168be0cd6d105d37b0ebd0d11bd36d7d9db63984eb2cc7b3aaff2fc9446d9558d1469b538a79b7de465a1113560ea