[commit: ghc] wip/nfs-locking: Move package.conf.inplace to build directory (038dfb4)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 01:11:35 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/038dfb43604a5316e0b44f745e9367a09fb6a217/ghc

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

commit 038dfb43604a5316e0b44f745e9367a09fb6a217
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Oct 22 23:47:39 2016 +0100

    Move package.conf.inplace to build directory


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

038dfb43604a5316e0b44f745e9367a09fb6a217
 src/Settings/Packages/Rts.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Settings/Packages/Rts.hs b/src/Settings/Packages/Rts.hs
index f3f2e43..f2b4035 100644
--- a/src/Settings/Packages/Rts.hs
+++ b/src/Settings/Packages/Rts.hs
@@ -9,13 +9,13 @@ import Oracles.Config.Setting
 import Oracles.WindowsPath
 import Predicate
 import Settings
+import Settings.Paths
 
 rtsConfIn :: FilePath
 rtsConfIn = pkgPath rts -/- "package.conf.in"
 
--- TODO: move to buildRootPath, see #113
 rtsConf :: FilePath
-rtsConf = pkgPath rts -/- contextDirectory rtsContext -/- "package.conf.inplace"
+rtsConf = buildPath rtsContext -/- "package.conf.inplace"
 
 rtsLibffiLibraryName :: Action FilePath
 rtsLibffiLibraryName = do



More information about the ghc-commits mailing list