Move RTS path settings to Settings.Path

src/Rules.hs

@@ -19,7 +19,6 @@ import qualified Rules.Perl
 import qualified Rules.Program
 import qualified Rules.Register
 import Settings
-import Settings.Packages.Rts
 import Settings.Path
 
 allStages :: [Stage]

src/Rules/Data.hs

@@ -9,7 +9,6 @@ import Oracles.Dependencies
 import Oracles.Path
 import Rules.Generate
 import Rules.Libffi
-import Settings.Packages.Rts
 import Settings.Path
 import Target
 import UserSettings

src/Rules/Generate.hs

@@ -17,7 +17,6 @@ import Rules.Generators.GhcSplit
 import Rules.Generators.GhcVersionH
 import Rules.Generators.VersionHs
 import Rules.Libffi
-import Settings.Packages.Rts
 import Settings.Path
 import Target
 import UserSettings

src/Settings/Packages/Rts.hs

-module Settings.Packages.Rts (
-    rtsPackageArgs, rtsConfIn, rtsConf, rtsContext, rtsLibffiLibraryName
-    ) where
+module Settings.Packages.Rts (rtsPackageArgs, rtsLibffiLibraryName) where
 
 import Base
 import GHC
@@ -9,16 +7,6 @@ import Oracles.Config.Setting
 import Oracles.Path
 import Predicate
 import Settings
-import Settings.Path
-
-rtsContext :: Context
-rtsContext = vanillaContext Stage1 rts
-
-rtsConfIn :: FilePath
-rtsConfIn = pkgPath rts -/- "package.conf.in"
-
-rtsConf :: FilePath
-rtsConf = pkgInplaceConfig rtsContext
 
 rtsLibffiLibraryName :: Action FilePath
 rtsLibffiLibraryName = do

src/Settings/Path.hs

@@ -4,7 +4,7 @@ module Settings.Path (
     gmpBuildInfoPath, generatedPath, libffiBuildPath, shakeFilesPath,
     pkgConfFile, packageDbDirectory, packageDbStamp, bootPackageConstraints,
     packageDependencies, objectPath, programInplacePath, programInplaceLibPath,
-    installPath, autogenPath, pkgInplaceConfig
+    installPath, autogenPath, pkgInplaceConfig, rtsContext, rtsConfIn
     ) where
 
 import Base
@@ -100,6 +100,14 @@ pkgFile context prefix suffix = do
     componentId <- pkgData $ ComponentId path
     return $ path -/- prefix ++ componentId ++ suffix
 
+-- | RTS is considered a Stage1 package. This determines RTS build path.
+rtsContext :: Context
+rtsContext = vanillaContext Stage1 rts
+
+-- | Path to RTS package configuration file, to be processed by HsCpp.
+rtsConfIn :: FilePath
+rtsConfIn = pkgPath rts -/- "package.conf.in"
+
 -- | Build directory for in-tree GMP library.
 gmpBuildPath :: FilePath
 gmpBuildPath = buildRootPath -/- "stage1/gmp"