diff --git a/pkgs/by-name/bm/bmake/setup-hook.sh b/pkgs/by-name/bm/bmake/setup-hook.sh index a36d024b111e..d6a7c4aafa0f 100644 --- a/pkgs/by-name/bm/bmake/setup-hook.sh +++ b/pkgs/by-name/bm/bmake/setup-hook.sh @@ -14,9 +14,8 @@ bmakeBuildPhase() { local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES}} SHELL="$SHELL" - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} ) + concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray echoCmd 'build flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -42,11 +41,8 @@ bmakeCheckPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL" - # Old bash empty array hack - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} - ${checkTarget} ) + concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget echoCmd 'check flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -65,11 +61,8 @@ bmakeInstallPhase() { local flagsArray=( ${enableParallelInstalling:+-j${NIX_BUILD_CORES}} SHELL="$SHELL" - # Old bash empty array hack - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} - ${installTargets:-install} ) + concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install echoCmd 'install flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -84,10 +77,8 @@ bmakeDistPhase() { mkdir -p "$prefix" fi - # Old bash empty array hack - local flagsArray=( - $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist} - ) + local flagsArray=() + concatTo flagsArray distFlags distFlagsArray distTarget=dist echo 'dist flags: %q' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}"