[commit: ghc] wip/nfs-locking: Add knownWays and knownRtsWays to Settings.Ways. (12cecf1)

[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/12cecf14f5205327b6520f72f8ddcb94a416fba9/ghc

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

commit 12cecf14f5205327b6520f72f8ddcb94a416fba9
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Aug 5 22:31:19 2015 +0100

    Add knownWays and knownRtsWays to Settings.Ways.


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

12cecf14f5205327b6520f72f8ddcb94a416fba9
 src/Settings/GhcCabal.hs |  1 +
 src/Settings/User.hs     |  1 -
 src/Settings/Ways.hs     | 16 ++++++++++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Settings/GhcCabal.hs b/src/Settings/GhcCabal.hs
index dfcb3df..5f264b2 100644
--- a/src/Settings/GhcCabal.hs
+++ b/src/Settings/GhcCabal.hs
@@ -15,6 +15,7 @@ import Oracles.Setting
 import Settings.User
 import Settings.Ways
 import Settings.Util
+import Settings.Packages
 
 cabalArgs :: Args
 cabalArgs = builder GhcCabal ? do
diff --git a/src/Settings/User.hs b/src/Settings/User.hs
index 6426e82..572feb4 100644
--- a/src/Settings/User.hs
+++ b/src/Settings/User.hs
@@ -1,5 +1,4 @@
 module Settings.User (
-    module Settings.Default,
     userArgs, userPackages, userWays, userRtsWays, userTargetDirectory,
     userKnownPackages, integerLibrary,
     buildHaddock, validating, ghciWithDebugger, ghcProfiled,
diff --git a/src/Settings/Ways.hs b/src/Settings/Ways.hs
index c8377eb..ae4bd38 100644
--- a/src/Settings/Ways.hs
+++ b/src/Settings/Ways.hs
@@ -1,6 +1,7 @@
 module Settings.Ways (
     ways, getWays,
-    rtsWays, getRtsWays
+    rtsWays, getRtsWays,
+    knownWays, knownRtsWays
     ) where
 
 import Way
@@ -8,7 +9,7 @@ import Stage
 import Switches
 import Expression
 import Oracles.Flag
-import Settings.User
+import Settings.User hiding (parallel)
 
 -- Combining default ways with user modifications
 ways :: Ways
@@ -39,3 +40,14 @@ defaultRtsWays = do
         , (dynamic `elem` ways) ?
           append [ dynamic, debugDynamic, threadedDynamic, threadedDebugDynamic
                  , loggingDynamic, threadedLoggingDynamic ] ]
+
+-- These are all ways known to the build system
+knownWays :: [Way]
+knownWays = [vanilla, profiling, logging, parallel, granSim]
+
+knownRtsWays :: [Way]
+knownRtsWays = [ threaded, threadedProfiling, threadedLogging, debug
+               , debugProfiling, threadedDebug, threadedDebugProfiling, dynamic
+               , profilingDynamic, threadedProfilingDynamic, threadedDynamic
+               , threadedDebugDynamic, debugDynamic, loggingDynamic
+               , threadedLoggingDynamic ]