about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorTatsuyuki Ishi <ishitatsuyuki@gmail.com>2022-10-20 18:09:52 +0900
committerTatsuyuki Ishi <ishitatsuyuki@gmail.com>2022-10-20 18:18:25 +0900
commit354e95ac62333102465426a772852bf62443192d (patch)
tree5b45251e0e46f4b4127d2c5f492d75d675b4d329 /src/ci
parentaad709b7ac2e35d364875c7ec151fb24df1ff46e (diff)
downloadrust-354e95ac62333102465426a772852bf62443192d.tar.gz
rust-354e95ac62333102465426a772852bf62443192d.zip
ci: Use ninja in build-clang.sh
Now that we have brought ninja back to the installed base packages, we can
use it for the initial Clang build as well.
Diffstat (limited to 'src/ci')
-rwxr-xr-xsrc/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh
index 9abfd4e9731..15ab3e5bd6e 100755
--- a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh
+++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh
@@ -25,6 +25,7 @@ INC="/rustroot/include:/usr/include"
 # disable them. BOLT is used for optimizing LLVM.
 hide_output \
     cmake ../llvm \
+      -GNinja \
       -DCMAKE_C_COMPILER=/rustroot/bin/gcc \
       -DCMAKE_CXX_COMPILER=/rustroot/bin/g++ \
       -DCMAKE_BUILD_TYPE=Release \
@@ -39,8 +40,8 @@ hide_output \
       -DLLVM_ENABLE_PROJECTS="clang;lld;compiler-rt;bolt" \
       -DC_INCLUDE_DIRS="$INC"
 
-hide_output make -j$(nproc)
-hide_output make install
+hide_output ninja
+hide_output ninja install
 
 cd ../..
 rm -rf llvm-project