[commit: ghc] wip/nfs-locking: Minor revision. (507f48d)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/507f48d12b6715d0943ae1b6bc4d7e8b6c676870/ghc

>---------------------------------------------------------------

commit 507f48d12b6715d0943ae1b6bc4d7e8b6c676870
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Feb 8 23:52:38 2016 +0000

    Minor revision.


>---------------------------------------------------------------

507f48d12b6715d0943ae1b6bc4d7e8b6c676870
 src/Rules/Actions.hs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Rules/Actions.hs b/src/Rules/Actions.hs
index 9275207..1a6fbf8 100644
--- a/src/Rules/Actions.hs
+++ b/src/Rules/Actions.hs
@@ -106,17 +106,16 @@ runConfigure dir opts args = do
     need [dir -/- "configure"]
     let args' = filter (not . null) args
         note  = if null args' then "" else " (" ++ intercalate ", " args' ++ ")"
+        -- Always configure with bash.
+        -- This also injects /bin/bash into `libtool`, instead of /bin/sh
+        opts' = opts ++ [AddEnv "CONFIG_SHELL" "/bin/bash"]
     if dir == "."
     then do
         putBuild $ "| Run configure" ++ note ++ "..."
-        quietly $ cmd Shell (EchoStdout False) "bash configure" opts' args
+        quietly $ cmd Shell (EchoStdout False) "bash configure" opts' args'
     else do
         putBuild $ "| Run configure" ++ note ++ " in " ++ dir ++ "..."
-        quietly $ cmd Shell (EchoStdout False) [Cwd dir] "bash configure" opts' args
-    where
-        -- Always configure with bash.
-        -- This also injects /bin/bash into `libtool`, instead of /bin/sh
-        opts' = opts ++ [AddEnv "CONFIG_SHELL" "/bin/bash"]
+        quietly $ cmd Shell (EchoStdout False) [Cwd dir] "bash configure" opts' args'
 
 runMake :: FilePath -> [String] -> Action ()
 runMake = runMakeWithVerbosity False