diff options
| author | Laurențiu Nicola <lnicola@users.noreply.github.com> | 2025-08-11 06:58:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-11 06:58:04 +0000 |
| commit | 6bb9af0eeb944611c3c87adca77afe86eda193d0 (patch) | |
| tree | 346a19d4687bd378070c21e87c4001aa6737c017 /src/ci/docker/scripts | |
| parent | bd46f7b6aefa7fcd1bb6d7e278bbc8d6b94cf3f4 (diff) | |
| parent | 0585bdff8b6a6e239858f8153ab48f4053afe798 (diff) | |
| download | rust-6bb9af0eeb944611c3c87adca77afe86eda193d0.tar.gz rust-6bb9af0eeb944611c3c87adca77afe86eda193d0.zip | |
Merge pull request #20424 from rust-lang/rustc-pull
Rustc pull update
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/build-clang.sh | 6 |
1 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) |