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

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

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

commit a66be35210083bbc2646b38df3a224a77f37dbf1
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Dec 20 04:09:14 2015 +0000

    Clean up.


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

a66be35210083bbc2646b38df3a224a77f37dbf1
 src/Rules/Dependencies.hs         |  1 -
 src/Settings/Builders/GhcCabal.hs | 18 +++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Rules/Dependencies.hs b/src/Rules/Dependencies.hs
index 1def1ac..996d927 100644
--- a/src/Rules/Dependencies.hs
+++ b/src/Rules/Dependencies.hs
@@ -24,7 +24,6 @@ buildPackageDependencies _ target @ (PartialTarget stage pkg) =
         hDepFile %> \file -> do
             srcs <- interpretPartial target getPackageSources
             when (pkg == compiler) $ need [platformH]
-            putBuild $ "srcs = " ++ show srcs
             need srcs
             if srcs == []
             then writeFileChanged file ""
diff --git a/src/Settings/Builders/GhcCabal.hs b/src/Settings/Builders/GhcCabal.hs
index 01b061e..151cd5f 100644
--- a/src/Settings/Builders/GhcCabal.hs
+++ b/src/Settings/Builders/GhcCabal.hs
@@ -40,12 +40,12 @@ ghcCabalHsColourArgs = builder GhcCabalHsColour ? do
 -- TODO: Need compiler_stage1_CONFIGURE_OPTS += --disable-library-for-ghci?
 libraryArgs :: Args
 libraryArgs = do
-    ways <- getWays
-    ghci <- lift ghcWithInterpreter
+    ways     <- getWays
+    withGhci <- lift ghcWithInterpreter
     append [ if vanilla `elem` ways
              then  "--enable-library-vanilla"
              else "--disable-library-vanilla"
-           , if vanilla `elem` ways && ghci && not dynamicGhcPrograms
+           , if vanilla `elem` ways && withGhci && not dynamicGhcPrograms
              then  "--enable-library-for-ghci"
              else "--disable-library-for-ghci"
            , if profiling `elem` ways
@@ -224,12 +224,12 @@ needDll0 stage pkg = do
 -- * otherwise, we must collapse it into one space-separated string.
 dll0Args :: Args
 dll0Args = do
-    stage <- getStage
-    pkg   <- getPackage
-    dll0  <- lift $ needDll0 stage pkg
-    ghci  <- lift ghcWithInterpreter
-    arg . unwords . concat $ [ modules     | dll0         ]
-                          ++ [ ghciModules | dll0 && ghci ] -- see #9552
+    stage    <- getStage
+    pkg      <- getPackage
+    dll0     <- lift $ needDll0 stage pkg
+    withGhci <- lift ghcWithInterpreter
+    arg . unwords . concat $ [ modules     | dll0             ]
+                          ++ [ ghciModules | dll0 && withGhci ] -- see #9552
   where
     modules = [ "Annotations"
               , "ApiAnnotation"