From 58ba889792ced997fb73babfafce2535080031d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 9 Jan 2018 15:52:20 +0200 Subject: [PATCH] Build llvm with ninja, if available This speeds up incremental builds. --- Dockerfile | 2 +- build-llvm.sh | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 59460c7..37646d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 RUN apt-get update -qq && apt-get install -qqy \ git wget bzip2 file unzip libtool pkg-config cmake build-essential \ - automake yasm gettext autopoint vim python git-svn + automake yasm gettext autopoint vim python git-svn ninja-build RUN git config --global user.name "LLVM MinGW" && \ diff --git a/build-llvm.sh b/build-llvm.sh index ae0db74..be0f898 100755 --- a/build-llvm.sh +++ b/build-llvm.sh @@ -36,13 +36,23 @@ if [ ! -d llvm ]; then cd ../../.. fi +if [ "$(which ninja)" != "" ]; then + CMAKE_GENERATOR="-G Ninja" + NINJA=1 +fi + cd llvm mkdir -p build cd build cmake \ + $CMAKE_GENERATOR \ -DCMAKE_INSTALL_PREFIX="$PREFIX" \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_ENABLE_ASSERTIONS=ON \ -DLLVM_TARGETS_TO_BUILD="ARM;AArch64;X86" \ .. -make -j$CORES install +if [ -n "$NINJA" ]; then + ninja install +else + make -j$CORES install +fi