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

Merge pull request #54652 from matthewbauer/shell-in-flags-array

Browse Source 
setup.sh: put SHELL in flagsArray
This commit is contained in:
Matthew Bauer 2019-01-27 13:55:54 -05:00 committed by GitHub
commit bd62ac6b88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/stdenv/generic/setup.sh
View File

@ -1012,13 +1012,11 @@ buildPhase() {
else else
foundMakefile=1 foundMakefile=1
# See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
makeFlags="SHELL=$SHELL $makeFlags"
# Old bash empty array hack # Old bash empty array hack
# shellcheck disable=SC2086 # shellcheck disable=SC2086
local flagsArray=( local flagsArray=(
${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
SHELL=$SHELL
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
$buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"}
) )
@ -1057,6 +1055,7 @@ checkPhase() {
# shellcheck disable=SC2086 # shellcheck disable=SC2086
local flagsArray=( local flagsArray=(
${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
SHELL=$SHELL
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
${checkTarget} ${checkTarget}
@ -1082,6 +1081,7 @@ installPhase() {
# Old bash empty array hack # Old bash empty array hack
# shellcheck disable=SC2086 # shellcheck disable=SC2086
local flagsArray=( local flagsArray=(
SHELL=$SHELL
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
$installFlags ${installFlagsArray+"${installFlagsArray[@]}"} $installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
${installTargets:-install} ${installTargets:-install}
@ -1189,6 +1189,7 @@ installCheckPhase() {
# shellcheck disable=SC2086 # shellcheck disable=SC2086
local flagsArray=( local flagsArray=(
${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
SHELL=$SHELL
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
$installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"} $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
${installCheckTarget:-installcheck} ${installCheckTarget:-installcheck}