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

stdenv/setup.sh: fix previous change...

Browse Source 
for the case that there is no makefile. CC #1354
This commit is contained in:
Vladimír Čunát 2013-12-28 08:17:14 +01:00
parent 3f4b14d793
commit d978c35ff9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,9 +109,6 @@ runHook preHook
# Check that the pre-hook initialised SHELL. # Check that the pre-hook initialised SHELL.
if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi
# see https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
makeFlags="${makeFlags} SHELL=${SHELL}"
# Hack: run gcc's setup hook. # Hack: run gcc's setup hook.
envHooks=() envHooks=()
crossEnvHooks=() crossEnvHooks=()
@ -617,6 +614,9 @@ buildPhase() {
return return
fi fi
# see https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
makeFlags="${makeFlags} SHELL=${SHELL}"
echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}" echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
make ${makefile:+-f $makefile} \ make ${makefile:+-f $makefile} \
${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \ ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \