diff --git a/bin/build.sh b/bin/build.sh index 22c3b141..8fefad49 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -7,6 +7,11 @@ ROOTPATH="$(dirname "$SCRIPTPATH")" echo Building from from $SCRIPTPATH cd $SCRIPTPATH +USE_NINJA="" +if command -v ninja >/dev/null 2>&1 ; then + USE_NINJA="-GNinja" +fi + # exit when any command fails set -e @@ -35,10 +40,10 @@ if [ ! -d jbuild_d ]; then mkdir jbuild fi cd jbuild_d -cmake -DCMAKE_BUILD_TYPE=Debug ../ +cmake $USE_NINJA -DCMAKE_BUILD_TYPE=Debug ../ cmake --build . cd ../jbuild -cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ../ +cmake $USE_NINJA -DCMAKE_BUILD_TYPE=RelWithDebInfo ../ cmake --build . cd ../IDE/dist diff --git a/extern/llvm_build.sh b/extern/llvm_build.sh index 261e8062..b81e11b6 100755 --- a/extern/llvm_build.sh +++ b/extern/llvm_build.sh @@ -1,6 +1,11 @@ #!/bin/bash set -e +USE_NINJA="" +if command -v ninja >/dev/null 2>&1 ; then + USE_NINJA="-GNinja" +fi + if [ ! -d llvm-project_13_0_1 ]; then if [ -f llvm-13.0.1.src.tar.xz ]; then # if user downloaded llvm-13.0.1.src.tar.xz then use it instead tar -xf llvm-13.0.1.src.tar.xz @@ -17,7 +22,7 @@ fi if [ ! -d llvm_linux_13_0_1/bin ]; then cd llvm_linux_13_0_1 - cmake ../llvm-project_13_0_1/llvm -DLLVM_TARGETS_TO_BUILD="AArch64;ARM;X86;WebAssembly" -DCMAKE_BUILD_TYPE:String="Debug" + cmake $USE_NINJA ../llvm-project_13_0_1/llvm -DLLVM_TARGETS_TO_BUILD="AArch64;ARM;X86;WebAssembly" -DCMAKE_BUILD_TYPE:String="Debug" cmake --build . -t $(cat ../llvm_targets.txt) cd .. fi @@ -28,7 +33,7 @@ fi if [ ! -d llvm_linux_rel_13_0_1/bin ]; then cd llvm_linux_rel_13_0_1 - cmake ../llvm-project_13_0_1/llvm -DLLVM_TARGETS_TO_BUILD="AArch64;ARM;X86;WebAssembly" -DCMAKE_BUILD_TYPE:String="Release" + cmake $USE_NINJA ../llvm-project_13_0_1/llvm -DLLVM_TARGETS_TO_BUILD="AArch64;ARM;X86;WebAssembly" -DCMAKE_BUILD_TYPE:String="Release" cmake --build . -t $(cat ../llvm_targets.txt) cd .. fi