[commit: ghc] wip/nfs-locking: Do putInfo even in verbose mode, minor revision. (0b6c0aa)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:27:53 UTC 2017


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

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

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

commit 0b6c0aa0b4dcbbc3eb65a101edf7db64c72043b4
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon May 2 03:08:10 2016 +0100

    Do putInfo even in verbose mode, minor revision.


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

0b6c0aa0b4dcbbc3eb65a101edf7db64c72043b4
 src/Rules/Actions.hs | 3 ++-
 src/Settings/User.hs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Rules/Actions.hs b/src/Rules/Actions.hs
index 5af1ce4..f006947 100644
--- a/src/Rules/Actions.hs
+++ b/src/Rules/Actions.hs
@@ -46,7 +46,7 @@ customBuild rs opts target at Target {..} = do
     -- The line below forces the rule to be rerun if the args hash has changed
     checkArgsHash target
     withResources rs $ do
-        unless verbose $ putInfo target
+        putInfo target
         quietlyUnlessVerbose $ case builder of
             Ar -> do
                 output <- interpret target getOutput
@@ -59,6 +59,7 @@ customBuild rs opts target at Target {..} = do
 
             Configure dir -> 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
 
diff --git a/src/Settings/User.hs b/src/Settings/User.hs
index 215a05b..0893579 100644
--- a/src/Settings/User.hs
+++ b/src/Settings/User.hs
@@ -81,7 +81,7 @@ buildHaddock = return cmdBuildHaddock
 -- this is a Predicate, hence you can enable verbose output for a chosen package
 -- only, e.g.: verboseCommands = package ghcPrim
 verboseCommands :: Predicate
-verboseCommands = builder Configure
+verboseCommands = return False
 
 -- TODO: Replace with stage2 ? arg "-Werror"?
 -- | To enable -Werror in Stage2 set turnWarningsIntoErrors = stage2.



More information about the ghc-commits mailing list