[commit: ghc] wip/nfs-locking: Fix autogen path for iserv (38d1f55)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 01:05:52 UTC 2017


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

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

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

commit 38d1f551cbd1dd94d33da9290e98bacca394f285
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Jul 14 02:07:25 2016 +0100

    Fix autogen path for iserv
    
    See #269.


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

38d1f551cbd1dd94d33da9290e98bacca394f285
 src/Rules/Data.hs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Rules/Data.hs b/src/Rules/Data.hs
index 034b2f4..959a7ec 100644
--- a/src/Rules/Data.hs
+++ b/src/Rules/Data.hs
@@ -41,10 +41,11 @@ buildPackageData context at Context {..} = do
         -- TODO: This is a hack. Add a proper support for autogen directory
         -- structure of the new Cabal (probably only after #113).
         let oldBuild
-                | isLibrary package = oldPath -/- "build"
-                | package == ghc    = oldPath -/- "build/ghc"
-                | package == hpcBin = oldPath -/- "build/hpc"
-                | otherwise         = oldPath -/- "build" -/- pkgNameString package
+                | isLibrary package   = oldPath -/- "build"
+                | package == ghc      = oldPath -/- "build/ghc"
+                | package == hpcBin   = oldPath -/- "build/hpc"
+                | package == iservBin = oldPath -/- "build/iserv"
+                | otherwise           = oldPath -/- "build" -/- pkgNameString package
         copyFile inTreeMk mk
         autogenFiles <- getDirectoryFiles oldBuild ["autogen/*"]
         createDirectory $ buildPath context -/- "autogen"



More information about the ghc-commits mailing list