From e2981f099ca037269844a3ec6fccbe0b1f45fd38 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 17 Jul 2025 14:25:53 +0200 Subject: Update host toolchain Necessary to avoid a bolt-related crash. --- src/ci/docker/scripts/build-clang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ci/docker/scripts') diff --git a/src/ci/docker/scripts/build-clang.sh b/src/ci/docker/scripts/build-clang.sh index 536991cc06b..f2972abd144 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 -- cgit 1.4.1-3-g733a5 From e6c0e63bd59be191a45d76f0a0e028e735c9fa9a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 5 Aug 2025 09:29:43 +0200 Subject: Use runtimes build for host compiler-rt build The project build for compiler-rt is deprecated. The runtimes build will use the just-built clang. As such, we also need to pass --gcc-toolchain to the runtimes build, so that it can find the GCC installation. --- src/ci/docker/scripts/build-clang.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/ci/docker/scripts') diff --git a/src/ci/docker/scripts/build-clang.sh b/src/ci/docker/scripts/build-clang.sh index f2972abd144..905c4077304 100755 --- a/src/ci/docker/scripts/build-clang.sh +++ b/src/ci/docker/scripts/build-clang.sh @@ -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) -- cgit 1.4.1-3-g733a5