public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ninja: don’t use build/install/check flags in setup-hook

Browse Source 
These don’t have much use in ninja, so easiest to leave them out.
This commit is contained in:
Matthew Bauer 2018-11-18 19:03:03 -06:00
parent 4ebab3de1e
commit a16c04c9d3
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/build-managers/ninja/setup-hook.sh
View File

@ -11,7 +11,6 @@ ninjaBuildPhase() {
local flagsArray=( local flagsArray=(
-j$buildCores -l$buildCores -j$buildCores -l$buildCores
$ninjaFlags "${ninjaFlagsArray[@]}" $ninjaFlags "${ninjaFlagsArray[@]}"
$buildFlags "${buildFlagsArray[@]}"
) )
echoCmd 'build flags' "${flagsArray[@]}" echoCmd 'build flags' "${flagsArray[@]}"
@ -31,7 +30,6 @@ ninjaInstallPhase() {
# shellcheck disable=SC2086 # shellcheck disable=SC2086
local flagsArray=( local flagsArray=(
$ninjaFlags "${ninjaFlagsArray[@]}" $ninjaFlags "${ninjaFlagsArray[@]}"
$installFlags "${installFlagsArray[@]}"
${installTargets:-install} ${installTargets:-install}
) )
@ -67,7 +65,6 @@ ninjaCheckPhase() {
local flagsArray=( local flagsArray=(
-j$buildCores -l$buildCores -j$buildCores -l$buildCores
$ninjaFlags "${ninjaFlagsArray[@]}" $ninjaFlags "${ninjaFlagsArray[@]}"
$checkFlags "${checkFlagsArray[@]}"
$checkTarget $checkTarget
) )