[commit: ghc] wip/nfs-locking: Unify paths. (56d3256)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:48:39 UTC 2017


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

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

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

commit 56d32568e5f290d9c93f11568b63e206caa0b9e1
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Feb 10 11:27:21 2016 +0000

    Unify paths.


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

56d32568e5f290d9c93f11568b63e206caa0b9e1
 src/Oracles/WindowsPath.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oracles/WindowsPath.hs b/src/Oracles/WindowsPath.hs
index 189c329..3cbf1f1 100644
--- a/src/Oracles/WindowsPath.hs
+++ b/src/Oracles/WindowsPath.hs
@@ -34,7 +34,7 @@ windowsPathOracle :: Rules ()
 windowsPathOracle = do
     answer <- newCache $ \path -> do
         Stdout out <- quietly $ cmd ["cygpath", "-m", path]
-        let windowsPath = dropWhileEnd isSpace out
+        let windowsPath = unifyPath $ dropWhileEnd isSpace out
         putOracle $ "Windows path mapping: " ++ path ++ " => " ++ windowsPath
         return windowsPath
     _ <- addOracle $ \(WindowsPath query) -> answer query



More information about the ghc-commits mailing list