diff options
| author | bors <bors@rust-lang.org> | 2025-08-06 04:36:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-08-06 04:36:54 +0000 |
| commit | dc0bae1db725fbba8524f195f74f680995fd549e (patch) | |
| tree | a9c5c78d9f05ac1b9c4d95c650687d22b2cc8246 /src | |
| parent | ec7c02612527d185c379900b613311bc1dcbf7dc (diff) | |
| parent | e6c0e63bd59be191a45d76f0a0e028e735c9fa9a (diff) | |
| download | rust-dc0bae1db725fbba8524f195f74f680995fd549e.tar.gz rust-dc0bae1db725fbba8524f195f74f680995fd549e.zip | |
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] https://github.com/llvm/llvm-project/issues/147781 * [x] https://github.com/llvm/llvm-project/issues/147935 * [x] https://github.com/llvm/llvm-project/issues/139443 * [x] https://github.com/llvm/llvm-project/pull/148207 * [x] https://github.com/llvm/llvm-project/pull/148607 * [x] https://github.com/llvm/llvm-project/pull/149046 * [x] https://github.com/llvm/llvm-project/issues/149097 * [x] https://github.com/rust-lang/rust/pull/144116 r? `@ghost`
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ci/docker/scripts/build-clang.sh | 6 | ||||
| m--------- | src/llvm-project | 0 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ci/docker/scripts/build-clang.sh b/src/ci/docker/scripts/build-clang.sh index 536991cc06b..905c4077304 100755 --- a/src/ci/docker/scripts/build-clang.sh +++ b/src/ci/docker/scripts/build-clang.sh @@ -5,7 +5,7 @@ set -ex source shared.sh # Try to keep the LLVM version here in sync with src/ci/scripts/install-clang.sh -LLVM=llvmorg-20.1.0-rc2 +LLVM=llvmorg-21.1.0-rc2 mkdir llvm-project cd llvm-project @@ -44,8 +44,10 @@ hide_output \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DLLVM_INCLUDE_TESTS=OFF \ -DLLVM_INCLUDE_EXAMPLES=OFF \ - -DLLVM_ENABLE_PROJECTS="clang;lld;compiler-rt;bolt" \ + -DLLVM_ENABLE_PROJECTS="clang;lld;bolt" \ + -DLLVM_ENABLE_RUNTIMES="compiler-rt" \ -DLLVM_BINUTILS_INCDIR="/rustroot/lib/gcc/$GCC_PLUGIN_TARGET/$GCC_VERSION/plugin/include/" \ + -DRUNTIMES_CMAKE_ARGS="-DCMAKE_CXX_FLAGS=\"--gcc-toolchain=/rustroot\"" \ -DC_INCLUDE_DIRS="$INC" hide_output make -j$(nproc) diff --git a/src/llvm-project b/src/llvm-project -Subproject e8a2ffcf322f45b8dce82c65ab27a3e2430a6b5 +Subproject d35840afa50d2615835d6a836f1967c57008188 |