Skip to content

Commit feadbb3

Browse files
authored
rust: update to 1.92.0 (#26793)
- 0014-rustc-perf-less-verbose.patch: remove, fixed upstream - enable bootstrapping for CLANG* too - we finally have pre-built stage0 toolchain for *-gnullvm targets - enable PGO for aarch64. it seemed to work in #\26523 config change: - use-lld -> bootstrap-override-lld - add windows-rc, it's probably not used for our targets, but... why not?
1 parent 4b68e2e commit feadbb3

File tree

3 files changed

+12
-29
lines changed

3 files changed

+12
-29
lines changed

mingw-w64-rust/0014-rustc-perf-less-verbose.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

mingw-w64-rust/PKGBUILD

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@
55
# Contributor: Philippe Renon <philippe_renon@yahoo.fr>
66

77
_bootstrapping=yes
8-
if [[ $MINGW_PACKAGE_PREFIX == *-clang-* ]]; then
9-
_bootstrapping=no
10-
fi
11-
if [[ $CARCH == x86_64 ]]; then
8+
if [[ $CARCH != i686 ]]; then
129
_pgo=1
1310
fi
1411
if [[ ${CARCH} != i686 && ${MSYSTEM} != MINGW64 ]]; then
1512
_wasm=1
1613
fi
1714

1815
rust_dist_server=https://static.rust-lang.org/dist
19-
#rust_dist_server=https://dev-static.rust-lang.org/dist/2025-10-27
16+
#rust_dist_server=https://dev-static.rust-lang.org/dist/2025-12-08
2017

2118
_realname=rust
2219
pkgbase=mingw-w64-${_realname}
@@ -25,7 +22,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
2522
$((( _wasm )) && echo \
2623
"${MINGW_PACKAGE_PREFIX}-rust-wasm" \
2724
"${MINGW_PACKAGE_PREFIX}-rust-emscripten"))
28-
pkgver=1.91.1
25+
pkgver=1.92.0
2926
pkgrel=1
3027
pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
3128
arch=('any')
@@ -69,21 +66,18 @@ source=("${rust_dist_server}/${_realname}c-${pkgver}-src.tar.xz"{,.asc}
6966
"0001-rustc-llvm-fix-libs.patch"
7067
"0004-compiler-Use-wasm-ld-for-wasm-targets.patch"
7168
"0008-disable-self-contained-for-gnu-targets.patch"
72-
"0014-rustc-perf-less-verbose.patch"
7369
"0016-allow-shared-llvm-for-all.patch"
7470
# patches in case of doing PGO for LLVM with opt-dist
7571
#"0015-lesser-llvm-build.patch"
76-
#"https://patch-diff.githubusercontent.com/raw/rust-lang/rust/pull/143898.patch"
7772
)
7873
noextract=(${_realname}c-${pkgver}-src.tar.xz)
79-
sha256sums=('66401bb815e236cc6b2aacbbe23b61b286c1fe27a67902e7c0222cfe77b3dbab'
74+
sha256sums=('ebee170bfe4c4dfc59521a101de651e5534f4dae889756a5c97ca9ea40d0c307'
8075
'SKIP'
81-
'c43af449a04bf3c5feb61356c537a617c663b5a61937686570feca3d3719a2b5'
76+
'575e47859d2ff5dbc73291a2f976bc682338e323b6e6c5858bc40955bbbb7005'
8277
'd693577fabe39a3046cd44fd002adf9557de6883eaea9007eae7f8372295ea0e'
8378
'7cb1773c288ffb1c1e751edc49b1890c84bf9c362742bc5225d19d474edb73a0'
8479
'56882f1a0f1404c10c7726d6cc37444f2b343e72b969badfcb43760f80db0f32'
8580
'87b68c2dfbe996d3ef439278e1ac90997fc4ea192f449e8f00262360a551386a'
86-
'6a8d987186785901d8a6e347d6ec3bccd84c869c9fa1a57cb9a30c8f6a3ce3ac'
8781
'f891ce9c3b040a17c8764d8dcbd78d39be089bffbfb884050f2a612a923536c6')
8882
validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
8983
'474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstellar@redhat.com>
@@ -117,7 +111,6 @@ prepare() {
117111
apply_patch_with_msg \
118112
0008-disable-self-contained-for-gnu-targets.patch \
119113
0004-compiler-Use-wasm-ld-for-wasm-targets.patch \
120-
0014-rustc-perf-less-verbose.patch \
121114
0016-allow-shared-llvm-for-all.patch
122115
}
123116

@@ -147,7 +140,7 @@ build() {
147140
# - remove --stage 2
148141

149142
export RUST_BACKTRACE=1
150-
export RUST_LOG=info
143+
export RUST_LOG=warn
151144
# force some system libraries
152145
export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
153146
export LIBSSH2_SYS_USE_PKG_CONFIG=1
@@ -170,12 +163,12 @@ build() {
170163
# Add tools and enable LTO for non-i686
171164
if [[ ${CARCH} != i686 ]]; then
172165
sed -i -e '/tools = \[/a\ "clippy", "rustdoc", "rustfmt", "rust-analyzer-proc-macro-srv", "analysis", "src",' \
173-
-e 's/#lto/lto/' bootstrap.toml
166+
-e 's/#lto/lto/' \
167+
-e 's/#link-shared/link-shared/' bootstrap.toml
174168
fi
175169

176170
if (( _pgo )); then
177-
sed -i -e 's/#use-lld/use-lld/' \
178-
-e 's/#link-shared/link-shared/' bootstrap.toml
171+
sed -i -e 's/#bootstrap-override-lld/bootstrap-override-lld/' bootstrap.toml
179172
# build opt-dist tool which manages PGO build
180173
python x.py build opt-dist --target="$OSTYPE"
181174
local _pgo_opts=(--target-triple="$OSTYPE"
@@ -185,7 +178,6 @@ build() {
185178
--python="${MINGW_PREFIX}/bin/python.exe"
186179
--artifact-dir=opt-artifacts-${MSYSTEM}
187180
--build-dir=build-${MSYSTEM})
188-
# CLANG* don't have prebuilt stage0
189181
if [[ ${_bootstrapping} == no ]]; then
190182
_pgo_opts+=(--stage0-root="${MINGW_PREFIX}")
191183
fi

mingw-w64-rust/bootstrap.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
profile = "dist"
33

44
# see src/bootstrap/src/utils/change_tracker.rs
5-
change-id = 146435
5+
change-id = 147888
66

77
[llvm]
88
#link-shared = true
@@ -19,6 +19,7 @@ host = ["$OSTYPE"]
1919
target = ["$OSTYPE"]
2020
build-dir = "build-$MSYSTEM"
2121
python = "$MINGW_PREFIX/bin/python.exe"
22+
windows-rc = "$MINGW_PREFIX/bin/llvm-rc.exe"
2223
locked-deps = true
2324
vendor = true
2425
tools = [
@@ -44,7 +45,7 @@ channel = "stable"
4445
rpath = false
4546
frame-pointers = true
4647
llvm-bitcode-linker = false
47-
#use-lld = "external"
48+
#bootstrap-override-lld = "external"
4849
llvm-tools = false
4950
codegen-tests = false
5051
deny-warnings = false

0 commit comments

Comments
 (0)