[commit: ghc] wip/nfs-locking: Don't add exe extension to builder paths on Windows. (e23dab7)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:07:33 UTC 2017


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

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

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

commit e23dab7cab22ecd9ba7f69ba735c43878a7b6c3a
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Apr 12 18:45:50 2016 +0100

    Don't add exe extension to builder paths on Windows.
    
    See #221, #222.


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

e23dab7cab22ecd9ba7f69ba735c43878a7b6c3a
 src/Builder.hs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Builder.hs b/src/Builder.hs
index e8011e7..a0cc093 100644
--- a/src/Builder.hs
+++ b/src/Builder.hs
@@ -133,9 +133,7 @@ builderPath builder = case builderProvenance builder of
             then return ""
             else putError $ "Builder '" ++ builderKey ++ "' is not specified in"
                 ++ " system.config file. Cannot proceed without it."
-        else do
-            path' <- lookupInPath path
-            fixAbsolutePathOnWindows $ path' -<.> exe
+        else fixAbsolutePathOnWindows =<< lookupInPath path
 
 getBuilderPath :: Builder -> ReaderT a Action FilePath
 getBuilderPath = lift . builderPath



More information about the ghc-commits mailing list