[commit: ghc] wip/nfs-locking: Add toStandard. (fd28d9a)

git at git.haskell.org git at git.haskell.org
Thu Oct 26 23:06:09 UTC 2017


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

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

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

commit fd28d9aa2dc7a212d20685e5541c1e059288c799
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jan 13 13:02:06 2015 +0000

    Add toStandard.


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

fd28d9aa2dc7a212d20685e5541c1e059288c799
 src/Package/Compile.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Package/Compile.hs b/src/Package/Compile.hs
index c42d592..56d168a 100644
--- a/src/Package/Compile.hs
+++ b/src/Package/Compile.hs
@@ -31,8 +31,8 @@ suffixArgs way = arg ["-hisuf", hisuf way]
 
 oRule :: Package -> TodoItem -> Rules ()
 oRule (Package name path _) (stage, dist, settings) =
-    let buildDir = path </> dist </> "build"
-        pkgData  = path </> dist </> "package-data.mk"
+    let buildDir = toStandard $ path </> dist </> "build"
+        pkgData  = toStandard $ path </> dist </> "package-data.mk"
         depFile  = buildDir </> name <.> "m"
     in
     (buildDir <//> "*o") %> \out -> do
@@ -59,7 +59,7 @@ oRule (Package name path _) (stage, dist, settings) =
 -- TODO: This rule looks hacky... combine it with the above?
 hiRule :: Package -> TodoItem -> Rules ()
 hiRule (Package name path _) (stage, dist, settings) =
-    let buildDir = path </> dist </> "build"
+    let buildDir = toStandard $ path </> dist </> "build"
     in
     (buildDir <//> "*hi") %> \out -> do
         let way  = detectWay $ tail $ takeExtension out



More information about the ghc-commits mailing list