Skip to content

Commit e6c0e63

Browse files
committed
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.
1 parent e2981f0 commit e6c0e63

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/ci/docker/scripts/build-clang.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ hide_output \
4444
-DLLVM_INCLUDE_BENCHMARKS=OFF \
4545
-DLLVM_INCLUDE_TESTS=OFF \
4646
-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" \
4849
-DLLVM_BINUTILS_INCDIR="/rustroot/lib/gcc/$GCC_PLUGIN_TARGET/$GCC_VERSION/plugin/include/" \
50+
-DRUNTIMES_CMAKE_ARGS="-DCMAKE_CXX_FLAGS=\"--gcc-toolchain=/rustroot\"" \
4951
-DC_INCLUDE_DIRS="$INC"
5052

5153
hide_output make -j$(nproc)

0 commit comments

Comments
 (0)