alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

setup.sh: remove bash empty array old hack

Browse source
This commit is contained in:
happysalada 2021-06-26 17:55:37 +09:00 committed by Raphael Megzari
parent fc5438bfcf
commit 5f8b5465e1
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/stdenv/generic/setup.sh
View file

@ -564,12 +564,12 @@ _addToEnv() {
#
# TODO(@Ericson2314): Don't special-case native compilation
for pkg in \
${pkgsBuildBuild+"${pkgsBuildBuild[@]}"} \
${pkgsBuildHost+"${pkgsBuildHost[@]}"} \
${pkgsBuildTarget+"${pkgsBuildTarget[@]}"} \
${pkgsHostHost+"${pkgsHostHost[@]}"} \
${pkgsHostTarget+"${pkgsHostTarget[@]}"} \
${pkgsTargetTarget+"${pkgsTargetTarget[@]}"}
"${pkgsBuildBuild[@]}" \
"${pkgsBuildHost[@]}" \
"${pkgsBuildTarget[@]}" \
"${pkgsHostHost[@]}" \
"${pkgsHostTarget[@]}" \
"${pkgsTargetTarget[@]}"
do
if [[ "$visitedPkgs" = *"$pkg"* ]]; then
continue
@ -1014,7 +1014,7 @@ configurePhase() {
IFS=" " read -r -a configureFlagsTemp <<< "$configureFlags"
local -a flagsArray=(
"${configureFlagsTemp[@]}"
${configureFlagsArray+"${configureFlagsArray[@]}"}
"${configureFlagsArray[@]}"
)
echoCmd 'configure flags' "${flagsArray[@]}"
# shellcheck disable=SC2086
@ -1045,9 +1045,9 @@ buildPhase() {
${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
SHELL="$SHELL"
"${makeFlagsTemp[@]}"
${makeFlagsArray+"${makeFlagsArray[@]}"}
"${makeFlagsArray[@]}"
"${buildFlagsTemp[@]}"
${buildFlagsArray+"${buildFlagsArray[@]}"}
"${buildFlagsArray[@]}"
)
echoCmd 'build flags' "${flagsArray[@]}"
@ -1087,9 +1087,9 @@ checkPhase() {
${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
SHELL="$SHELL"
"${makeFlagsTemp[@]}"
${makeFlagsArray+"${makeFlagsArray[@]}"}
"${makeFlagsArray[@]}"
"${checkFlagsTemp[@]}"
${checkFlagsArray+"${checkFlagsArray[@]}"}
"${checkFlagsArray[@]}"
"${checkTargetTemp[@]}"
)
@ -1117,9 +1117,9 @@ installPhase() {
local -a flagsArray=(
SHELL="$SHELL"
"${makeFlagsTemp[@]}"
${makeFlagsArray+"${makeFlagsArray[@]}"}
"${makeFlagsArray[@]}"
"${installFlagsTemp[@]}"
${installFlagsArray+"${installFlagsArray[@]}"}
"${installFlagsArray[@]}"
"${installTargetsTemp[@]}"
)
@ -1233,9 +1233,9 @@ installCheckPhase() {
${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
SHELL="$SHELL"
"${makeFlagsTemp[@]}"
${makeFlagsArray+"${makeFlagsArray[@]}"}
"${makeFlagsArray[@]}"
"${installCheckFlagsTemp[@]}"
${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
"${installCheckFlagsArray[@]}"
"${installCheckTargetTemp[@]}"
)