Skip to content

Commit cd96b46

Browse files
committed
rust-1.90: update clang/llvm dependencies to v21
We should be building rust-1.90 against clang and llvm 21 as upstream intended. rust-lang/rust#143684 Signed-off-by: David Negreira <[email protected]>
1 parent 335661f commit cd96b46

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

rust-1.90.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: rust-1.90
33
version: "1.90.0"
4-
epoch: 0
4+
epoch: 1
55
description: "Empowering everyone to build reliable and efficient software."
66
copyright:
77
- license: Apache-2.0 AND MIT
@@ -10,7 +10,7 @@ package:
1010
memory: 16Gi
1111
dependencies:
1212
runtime:
13-
- libLLVM-20
13+
- libLLVM-21
1414
provides:
1515
- rust=${{package.full-version}}
1616

@@ -20,16 +20,16 @@ environment:
2020
- build-base
2121
- busybox
2222
- ca-certificates-bundle
23-
- clang-20
23+
- clang-21
2424
- cmake
2525
- coreutils
2626
- curl-dev
2727
- file
28-
- libLLVM-20
28+
- libLLVM-21
2929
- libssh2-dev
3030
- libxml2-dev
31-
- llvm-20
32-
- llvm-20-dev
31+
- llvm-21
32+
- llvm-21-dev
3333
- openssl-dev
3434
- patch
3535
- python3
@@ -57,8 +57,8 @@ pipeline:
5757
TOOLCHAIN_BIN_DIR="$(dirname "$(rustup which cargo)")"
5858
export PATH="$TOOLCHAIN_BIN_DIR:$PATH"
5959
60-
export CFLAGS="$CFLAGS -O2 -I/usr/lib/llvm-20/include"
61-
export CXXFLAGS="$CXXFLAGS -O2 -I/usr/lib/llvm-20/include"
60+
export CFLAGS="$CFLAGS -O2 -I/usr/lib/llvm-21/include"
61+
export CXXFLAGS="$CXXFLAGS -O2 -I/usr/lib/llvm-21/include"
6262
export OPENSSL_NO_VENDOR=1
6363
export RUST_BACKTRACE=1
6464
export ARCH=${{host.triplet.rust}}
@@ -78,8 +78,8 @@ pipeline:
7878
--release-channel="stable" \
7979
--enable-local-rust \
8080
--local-rust-root="/usr" \
81-
--llvm-root="/usr/lib/llvm-20" \
82-
--llvm-config="/usr/lib/llvm-20/bin/llvm-config" \
81+
--llvm-root="/usr/lib/llvm-21" \
82+
--llvm-config="/usr/lib/llvm-21/bin/llvm-config" \
8383
--disable-docs \
8484
--enable-extended \
8585
--tools="cargo,src,clippy,rustfmt,rustdoc" \
@@ -113,8 +113,8 @@ pipeline:
113113
unset CARGO_PROFILE_RELEASE_OPT_LEVEL
114114
unset CARGO_PROFILE_RELEASE_PANIC
115115
unset CARGO_PROFILE_RELEASE_CODEGEN_UNITS
116-
export CFLAGS="$CFLAGS -O2 -I/usr/lib/llvm-20/include/"
117-
export CXXFLAGS="$CXXFLAGS -O2 -I/usr/lib/llvm-20/include/"
116+
export CFLAGS="$CFLAGS -O2 -I/usr/lib/llvm-21/include/"
117+
export CXXFLAGS="$CXXFLAGS -O2 -I/usr/lib/llvm-21/include/"
118118
export OPENSSL_NO_VENDOR=1
119119
export RUSTC_BOOTSTRAP=1
120120
export RUST_BACKTRACE=full

0 commit comments

Comments
 (0)