Commit dc0bae1

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 dc0bae1Copy full SHA for dc0bae1

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`[submodule "src/llvm-project"]`
`26`	`26`	`path = src/llvm-project`
`27`	`27`	`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`
`29`	`29`	`shallow = true`
`30`	`30`	`[submodule "src/doc/embedded-book"]`
`31`	`31`	`path = src/doc/embedded-book`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ set -ex`
`5`	`5`	`source shared.sh`
`6`	`6`
`7`	`7`	`# 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`
`9`	`9`
`10`	`10`	`mkdir llvm-project`
`11`	`11`	`cd llvm-project`
`@@ -44,8 +44,10 @@ hide_output \`
`44`	`44`	`-DLLVM_INCLUDE_BENCHMARKS=OFF \`
`45`	`45`	`-DLLVM_INCLUDE_TESTS=OFF \`
`46`	`46`	`-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" \`
`48`	`49`	`-DLLVM_BINUTILS_INCDIR="/rustroot/lib/gcc/$GCC_PLUGIN_TARGET/$GCC_VERSION/plugin/include/" \`
	`50`	`+ -DRUNTIMES_CMAKE_ARGS="-DCMAKE_CXX_FLAGS=\"--gcc-toolchain=/rustroot\"" \`
`49`	`51`	`-DC_INCLUDE_DIRS="$INC"`
`50`	`52`
`51`	`53`	`hide_output make -j$(nproc)`

Comments

(0)