From 2c7cd2455e39819748792f21b538dc8410afbc3a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 4 Dec 2017 15:15:58 +0000 Subject: [PATCH] ninja: support disabling parallel building but keep it enabled by default --- .../development/tools/build-managers/ninja/setup-hook.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/development/tools/build-managers/ninja/setup-hook.sh index 9ea6549a824..d9ad7460931 100644 --- a/pkgs/development/tools/build-managers/ninja/setup-hook.sh +++ b/pkgs/development/tools/build-managers/ninja/setup-hook.sh @@ -4,9 +4,16 @@ ninjaBuildPhase() { if [[ -z "$ninjaFlags" && ! ( -e build.ninja ) ]]; then echo "no build.ninja, doing nothing" else + local buildCores=1 + + # Parallel building is enabled by default. + if [ "${enableParallelBuilding-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi + # shellcheck disable=SC2086 local flagsArray=( \ - ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \ + -j"$buildCores" -l"$NIX_BUILD_CORES" \ $ninjaFlags "${ninjaFlagsArray[@]}" \ $buildFlags "${buildFlagsArray[@]}")