diff options
| author | Nikita Popov <npopov@redhat.com> | 2025-08-05 09:29:43 +0200 |
|---|---|---|
| committer | Nikita Popov <npopov@redhat.com> | 2025-08-05 15:43:51 +0200 |
| commit | e6c0e63bd59be191a45d76f0a0e028e735c9fa9a (patch) | |
| tree | 3b244a26f34be7fe1909be54c9b1e5df695d29fa /src/ci | |
| parent | e2981f099ca037269844a3ec6fccbe0b1f45fd38 (diff) | |
| download | rust-e6c0e63bd59be191a45d76f0a0e028e735c9fa9a.tar.gz rust-e6c0e63bd59be191a45d76f0a0e028e735c9fa9a.zip | |
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.
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/docker/scripts/build-clang.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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) |