diff options
| author | happysalada <raphael@megzari.com> | 2021-06-26 17:55:37 +0900 |
|---|---|---|
| committer | Raphael Megzari <raphael@megzari.com> | 2021-07-06 09:27:18 +0900 |
| commit | 5f8b5465e1ffb9e4eb59df548b217130ca065618 (patch) | |
| tree | 3898cd34db2c61a4336a3761f2969fef898d4bca /pkgs/stdenv/generic | |
| parent | fc5438bfcf243226065fe1cbcbee7d43e9550e31 (diff) | |
| download | nixpkgs-5f8b5465e1ffb9e4eb59df548b217130ca065618.tar nixpkgs-5f8b5465e1ffb9e4eb59df548b217130ca065618.tar.gz nixpkgs-5f8b5465e1ffb9e4eb59df548b217130ca065618.tar.bz2 nixpkgs-5f8b5465e1ffb9e4eb59df548b217130ca065618.tar.lz nixpkgs-5f8b5465e1ffb9e4eb59df548b217130ca065618.tar.xz nixpkgs-5f8b5465e1ffb9e4eb59df548b217130ca065618.tar.zst nixpkgs-5f8b5465e1ffb9e4eb59df548b217130ca065618.zip | |
setup.sh: remove bash empty array old hack
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ea1b5326f3b..81e93f86e9b 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -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[@]}" ) |