diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 08:17:14 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 10:43:34 +0100 |
| commit | d978c35ff966b64e7c2e5f251e4ed35a24a3e80d (patch) | |
| tree | e39e44b3ab007caf89019b6958270810c3fb3840 /pkgs/stdenv | |
| parent | 3f4b14d7937509a431ca7fa61f4b21b3b53fd6f8 (diff) | |
| download | nixlib-d978c35ff966b64e7c2e5f251e4ed35a24a3e80d.tar nixlib-d978c35ff966b64e7c2e5f251e4ed35a24a3e80d.tar.gz nixlib-d978c35ff966b64e7c2e5f251e4ed35a24a3e80d.tar.bz2 nixlib-d978c35ff966b64e7c2e5f251e4ed35a24a3e80d.tar.lz nixlib-d978c35ff966b64e7c2e5f251e4ed35a24a3e80d.tar.xz nixlib-d978c35ff966b64e7c2e5f251e4ed35a24a3e80d.tar.zst nixlib-d978c35ff966b64e7c2e5f251e4ed35a24a3e80d.zip | |
stdenv/setup.sh: fix previous change...
for the case that there is no makefile. CC #1354
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 96168da77537..b7940a069ce7 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -109,9 +109,6 @@ runHook preHook # Check that the pre-hook initialised SHELL. 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. envHooks=() crossEnvHooks=() @@ -617,6 +614,9 @@ buildPhase() { return fi + # see https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 + makeFlags="${makeFlags} SHELL=${SHELL}" + echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}" make ${makefile:+-f $makefile} \ ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \ |