[commit: ghc] wip/nfs-locking: Fix paths in inplace-pkg-config files (e081b08)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 01:15:04 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/e081b081214295de8a31631e9d00642965f7fc23/ghc
>---------------------------------------------------------------
commit e081b081214295de8a31631e9d00642965f7fc23
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Fri Dec 16 01:27:46 2016 +0000
Fix paths in inplace-pkg-config files
>---------------------------------------------------------------
e081b081214295de8a31631e9d00642965f7fc23
src/Rules/Data.hs | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/Rules/Data.hs b/src/Rules/Data.hs
index dc53654..cff0896 100644
--- a/src/Rules/Data.hs
+++ b/src/Rules/Data.hs
@@ -47,10 +47,8 @@ buildPackageData context at Context {..} = do
. replace "rts/dist/build" rtsBuildPath
. replace "includes/dist-derivedconstants/header" generatedPath )
. lines
- else do
- top <- topDirectory
- let oldPath = top -/- path </> "build"
- fixFile conf $ unlines . map (replace oldPath path) . lines
+ else
+ fixFile conf $ unlines . map (replace (path </> "build") path) . lines
priority 2.0 $ when (nonCabalContext context) $ dataFile %>
generatePackageData context
More information about the ghc-commits
mailing list