[commit: ghc] wip/nfs-locking: Clean up. (f80948c)

[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/f80948c6655e0c6bf2ba6a10e09647b78e5ee1ab/ghc

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

commit f80948c6655e0c6bf2ba6a10e09647b78e5ee1ab
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Jan 14 04:02:49 2015 +0000

    Clean up.


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

f80948c6655e0c6bf2ba6a10e09647b78e5ee1ab
 src/Oracles/Builder.hs |  8 +++-----
 src/Package/Base.hs    | 11 +++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/Oracles/Builder.hs b/src/Oracles/Builder.hs
index 5c9d64b..0fce046 100644
--- a/src/Oracles/Builder.hs
+++ b/src/Oracles/Builder.hs
@@ -107,13 +107,11 @@ run builder args = do
 -- Raises an error if the builder is not uniquely specified in config files
 terseRun :: Builder -> Args -> Action ()
 terseRun builder args = do
-    needBuilder builder
-    [exe] <- showArgs builder
     args' <- args
-    putNormal $ "|--------\n| Running " ++ show builder ++ " with arguments:"
+    putNormal $ "/--------\n| Running " ++ show builder ++ " with arguments:"
     mapM_ (putNormal . ("|   " ++)) $ interestingInfo builder args'
-    putNormal "|--------"
-    quietly $ cmd [exe] args'
+    putNormal "\\--------"
+    quietly $ run builder args
 
 interestingInfo :: Builder -> [String] -> [String]
 interestingInfo builder ss = case builder of
diff --git a/src/Package/Base.hs b/src/Package/Base.hs
index bac6801..9cf8fc8 100644
--- a/src/Package/Base.hs
+++ b/src/Package/Base.hs
@@ -65,13 +65,12 @@ commonLdArgs = mempty -- TODO: Why empty? Perhaps drop it altogether?
 commonCppArgs :: Args
 commonCppArgs = mempty -- TODO: Why empty? Perhaps drop it altogether?
 
--- TODO: simplify
 commonCcWarninigArgs :: Args
-commonCcWarninigArgs = when Validating $
-       GccIsClang <?> arg "-Wno-unknown-pragmas" 
-    <> (not GccIsClang && not GccLt46) <?> arg "-Wno-error=inline" 
-    <> (GccIsClang && not GccLt46 && windowsHost) <?>
-       arg "-Werror=unused-but-set-variable"
+commonCcWarninigArgs = when Validating $ arg
+       [ when GccIsClang                      $ arg "-Wno-unknown-pragmas"
+       , when (not GccIsClang && not GccLt46) $ arg "-Wno-error=inline"
+       , when (GccIsClang && not GccLt46 && windowsHost) $
+         arg "-Werror=unused-but-set-variable" ]
 
 bootPkgConstraints :: Args
 bootPkgConstraints = mempty