[commit: ghc] wip/nfs-locking: Move rtsContext to Settings.Packages.Rts (fd0cb1f)

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

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

commit fd0cb1f72339c7ec09962f81d4174e14224a6609
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Oct 29 02:15:08 2016 +0100

    Move rtsContext to Settings.Packages.Rts


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

fd0cb1f72339c7ec09962f81d4174e14224a6609
 src/GHC.hs                   | 6 +-----
 src/Rules.hs                 | 1 +
 src/Rules/Generate.hs        | 1 +
 src/Settings/Packages/Rts.hs | 5 ++++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/GHC.hs b/src/GHC.hs
index 0312a3e..2af8923 100644
--- a/src/GHC.hs
+++ b/src/GHC.hs
@@ -9,7 +9,7 @@ module GHC (
     parallel, pretty, primitive, process, rts, runGhc, stm, templateHaskell,
     terminfo, time, touchy, transformers, unlit, unix, win32, xhtml,
 
-    defaultKnownPackages, stageDirectory, rtsContext, programPath
+    defaultKnownPackages, stageDirectory, programPath
     ) where
 
 import Base
@@ -124,7 +124,3 @@ programPath Context {..}
     inplaceProgram name = programInplacePath -/- name <.> exe
     installProgram name = pkgPath package -/- stageDirectory stage
                                           -/- "build/tmp" -/- name <.> exe
-
--- TODO: Move this elsewhere.
-rtsContext :: Context
-rtsContext = vanillaContext Stage1 rts
diff --git a/src/Rules.hs b/src/Rules.hs
index e62ecc7..68a06c7 100644
--- a/src/Rules.hs
+++ b/src/Rules.hs
@@ -19,6 +19,7 @@ import qualified Rules.Perl
 import qualified Rules.Program
 import qualified Rules.Register
 import Settings
+import Settings.Packages.Rts
 import Settings.Paths
 
 allStages :: [Stage]
diff --git a/src/Rules/Generate.hs b/src/Rules/Generate.hs
index f8cf345..94bcc40 100644
--- a/src/Rules/Generate.hs
+++ b/src/Rules/Generate.hs
@@ -20,6 +20,7 @@ import Rules.Generators.GhcSplit
 import Rules.Generators.GhcVersionH
 import Rules.Generators.VersionHs
 import Rules.Libffi
+import Settings.Packages.Rts
 import Settings.Paths
 import Target
 import UserSettings
diff --git a/src/Settings/Packages/Rts.hs b/src/Settings/Packages/Rts.hs
index f2b4035..b3b86a9 100644
--- a/src/Settings/Packages/Rts.hs
+++ b/src/Settings/Packages/Rts.hs
@@ -1,5 +1,5 @@
 module Settings.Packages.Rts (
-    rtsPackageArgs, rtsConfIn, rtsConf, rtsLibffiLibraryName
+    rtsPackageArgs, rtsConfIn, rtsConf, rtsContext, rtsLibffiLibraryName
     ) where
 
 import Base
@@ -11,6 +11,9 @@ import Predicate
 import Settings
 import Settings.Paths
 
+rtsContext :: Context
+rtsContext = vanillaContext Stage1 rts
+
 rtsConfIn :: FilePath
 rtsConfIn = pkgPath rts -/- "package.conf.in"