[commit: ghc] wip/nfs-locking: Change computed configuration flags into Conditions. (9d8e3a3)

[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/9d8e3a33b4cc3aaf312dc068be9810043c40ff91/ghc

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

commit 9d8e3a33b4cc3aaf312dc068be9810043c40ff91
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Jan 1 22:35:50 2015 +0000

    Change computed configuration flags into Conditions.


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

9d8e3a33b4cc3aaf312dc068be9810043c40ff91
 src/Package.hs | 4 ++--
 src/Ways.hs    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Package.hs b/src/Package.hs
index 98558e9..4154dc5 100644
--- a/src/Package.hs
+++ b/src/Package.hs
@@ -78,7 +78,7 @@ libraryArgs ways =
     in mconcat
         [ argEnable False "library-for-ghci" -- TODO: why always disable?
         , argEnable (vanilla `elem` ways) "library-vanilla"        
-        , when (GhcWithInterpreter && not DynamicGhcPrograms && vanilla `elem` ways) $
+        , when (ghcWithInterpreter && not DynamicGhcPrograms && vanilla `elem` ways) $
             argEnable True "library-for-ghci"        
         , argEnable (profiling `elem` ways) "library-profiling"
         , argEnable (dynamic   `elem` ways) "shared"
@@ -143,7 +143,7 @@ buildPackageData pkg @ (Package name path _) (stage, dist, settings) =
                     , customConfArgs settings
                     , libraryArgs =<< ways settings                
 
-                    , when HsColourSrcs $ with HsColour
+                    , when hsColourSrcs $ with HsColour
                     , configureArgs stage settings
 
                     , when (stage == Stage0) $ bootPkgConstraints
diff --git a/src/Ways.hs b/src/Ways.hs
index a0e886a..0a4284a 100644
--- a/src/Ways.hs
+++ b/src/Ways.hs
@@ -65,7 +65,7 @@ allWays = [vanilla, profiling, logging, parallel, granSim,
 
 defaultWays :: Stage -> Action [Way]
 defaultWays stage = do
-    sharedLibs <- test PlatformSupportsSharedLibs
+    sharedLibs <- platformSupportsSharedLibs
     return $ [vanilla]
         ++ [profiling | stage /= Stage0] 
         ++ [dynamic   | sharedLibs     ]