Skip to content

Commit dc0bae1

Browse files
committed
Auto merge of #143684 - nikic:llvm-21, r=cuviper
Update to LLVM 21 Timeline: LLVM 21.1.0 is scheduled to release on Aug 26th. Rust 1.90 branches on Aug 1st and releases September 18. Depends on: * [x] llvm/llvm-project#147781 * [x] llvm/llvm-project#147935 * [x] llvm/llvm-project#139443 * [x] llvm/llvm-project#148207 * [x] llvm/llvm-project#148607 * [x] llvm/llvm-project#149046 * [x] llvm/llvm-project#149097 * [x] #144116 r? `@ghost`
2 parents ec7c026 + e6c0e63 commit dc0bae1

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
[submodule "src/llvm-project"]
2626
path = src/llvm-project
2727
url = https://github.com/rust-lang/llvm-project.git
28-
branch = rustc/20.1-2025-07-13
28+
branch = rustc/21.1-2025-08-01
2929
shallow = true
3030
[submodule "src/doc/embedded-book"]
3131
path = src/doc/embedded-book

src/ci/docker/scripts/build-clang.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -ex
55
source shared.sh
66

77
# Try to keep the LLVM version here in sync with src/ci/scripts/install-clang.sh
8-
LLVM=llvmorg-20.1.0-rc2
8+
LLVM=llvmorg-21.1.0-rc2
99

1010
mkdir llvm-project
1111
cd llvm-project
@@ -44,8 +44,10 @@ hide_output \
4444
-DLLVM_INCLUDE_BENCHMARKS=OFF \
4545
-DLLVM_INCLUDE_TESTS=OFF \
4646
-DLLVM_INCLUDE_EXAMPLES=OFF \
47-
-DLLVM_ENABLE_PROJECTS="clang;lld;compiler-rt;bolt" \
47+
-DLLVM_ENABLE_PROJECTS="clang;lld;bolt" \
48+
-DLLVM_ENABLE_RUNTIMES="compiler-rt" \
4849
-DLLVM_BINUTILS_INCDIR="/rustroot/lib/gcc/$GCC_PLUGIN_TARGET/$GCC_VERSION/plugin/include/" \
50+
-DRUNTIMES_CMAKE_ARGS="-DCMAKE_CXX_FLAGS=\"--gcc-toolchain=/rustroot\"" \
4951
-DC_INCLUDE_DIRS="$INC"
5052

5153
hide_output make -j$(nproc)

src/llvm-project

0 commit comments

Comments
 (0)