[commit: ghc] wip/nfs-locking: Show output of boot and configure. (72cbd44)

[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/72cbd44066d9a9e30c5c9613884d4f778afe42e5/ghc

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

commit 72cbd44066d9a9e30c5c9613884d4f778afe42e5
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu May 5 04:22:57 2016 +0100

    Show output of boot and configure.
    
    See #234.


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

72cbd44066d9a9e30c5c9613884d4f778afe42e5
 src/Rules/Actions.hs   |  2 +-
 src/Rules/Configure.hs | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Rules/Actions.hs b/src/Rules/Actions.hs
index 9910ce5..a312ce9 100644
--- a/src/Rules/Actions.hs
+++ b/src/Rules/Actions.hs
@@ -62,7 +62,7 @@ customBuild rs opts target at Target {..} = do
                 need [dir -/- "configure"]
                 -- Inject /bin/bash into `libtool`, instead of /bin/sh
                 let env = AddEnv "CONFIG_SHELL" "/bin/bash"
-                cmd Shell (EchoStdout False) [Cwd dir] [path] (env:opts) argList
+                cmd Shell [Cwd dir] [path] (env:opts) argList
 
             HsCpp    -> captureStdout target path argList
             GenApply -> captureStdout target path argList
diff --git a/src/Rules/Configure.hs b/src/Rules/Configure.hs
index d1c7cf2..44ed75c 100644
--- a/src/Rules/Configure.hs
+++ b/src/Rules/Configure.hs
@@ -1,6 +1,6 @@
 module Rules.Configure (configureRules) where
 
-import qualified System.Info
+import qualified System.Info as System
 
 import Base
 import Builder
@@ -22,12 +22,9 @@ configureRules = do
                 ++ "--skip-configure flag."
         else do
             -- We cannot use windowsHost here due to a cyclic dependency.
-            when (System.Info.os == "mingw32") $ do
+            when (System.os == "mingw32") $ do
                 putBuild "| Checking for Windows tarballs..."
-                quietly $ cmd [ "bash"
-                              , "mk/get-win32-tarballs.sh"
-                              , "download"
-                              , System.Info.arch ]
+                quietly $ cmd ["bash mk/get-win32-tarballs.sh download", System.arch]
             let srcs    = map (<.> "in") outs
                 context = vanillaContext Stage0 compiler
             need srcs
@@ -41,4 +38,4 @@ configureRules = do
         else do
             need ["configure.ac"]
             putBuild "| Running boot..."
-            quietly $ cmd (EchoStdout False) "perl boot"
+            quietly $ cmd "perl boot"