From d87452ed219676432704d91cabaa2abf437de5cb Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Thu, 18 Aug 2016 22:45:46 +0200 Subject: [PATCH] build.sh: allow to replace make by ninja to speed up the build system Quick benchmark. GCC debug mode Full build: 6 second better, it can 2 additional cores :) make : ./build.sh --dbg --clean 213.25s user 22.35s system 881% cpu 26.739 total ninja: ./build.sh --dbg --clean 203.94s user 18.31s system 1085% cpu 20.474 total No change build:: 1 second better :) make -C build_dbg -j 16 install 1.51s user 0.34s system 206% cpu 0.898 total ninja -C build_dbg -j 16 install 0.05s user 0.02s system 98% cpu 0.074 total --- build.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 1a3a70f61a..8f5a001da4 100755 --- a/build.sh +++ b/build.sh @@ -33,6 +33,10 @@ build="$root/build" coverity_dir="cov-int" coverity_result=pcsx2-coverity.xz +if [ -x `which ninja` ]; then + flags="$flags -GNinja" +fi + if [ `uname -s` = 'Darwin' ]; then ncpu=`sysctl -n hw.ncpu` release=$(uname -r) @@ -241,7 +245,12 @@ fi ############################################################ # Real build ############################################################ -make -j"$ncpu" 2>&1 | tee -a "$log" -make install 2>&1 | tee -a "$log" +if [ -x `which ninja` ]; then + ninja 2>&1 | tee -a "$log" + ninja install 2>&1 | tee -a "$log" +else + make -j"$ncpu" 2>&1 | tee -a "$log" + make install 2>&1 | tee -a "$log" +fi exit 0