[commit: ghc] wip/nfs-locking: Don't change extension of files found in PATH. (3787444)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:44:51 UTC 2017


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

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

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

commit 37874441d3ff2255fea40d60420d4353245ed930
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Jan 25 14:04:03 2016 +0000

    Don't change extension of files found in PATH.
    
    See #194.


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

37874441d3ff2255fea40d60420d4353245ed930
 src/Builder.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Builder.hs b/src/Builder.hs
index 22723a5..bfb757f 100644
--- a/src/Builder.hs
+++ b/src/Builder.hs
@@ -112,9 +112,9 @@ builderPath builder = case builderProvenance builder of
             ++ "' in configuration files. Have you forgot to run configure?"
         windows <- windowsHost
         case (path, windows) of
-            ("", _)    -> return path
-            (p, True)  -> fixAbsolutePathOnWindows (p -<.> exe)
-            (p, False) -> lookupInPath (p -<.> exe)
+            ("", _    ) -> return path
+            (p , True ) -> fixAbsolutePathOnWindows (p -<.> exe)
+            (p , False) -> lookupInPath p
 
 getBuilderPath :: Builder -> ReaderT a Action FilePath
 getBuilderPath = lift . builderPath



More information about the ghc-commits mailing list