From d978c35ff966b64e7c2e5f251e4ed35a24a3e80d Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 28 Dec 2013 08:17:14 +0100
Subject: stdenv/setup.sh: fix previous change...

for the case that there is no makefile. CC #1354
---
 pkgs/stdenv/generic/setup.sh | 6 +++---
 1 file 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}} \
-- 
cgit 1.4.1