From 1cbb658fcbde206c281cfbc117101af47356b2e5 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Sun, 17 Jan 2016 21:26:48 +0100
Subject: Fix GHC 8.0 errors

---
 CabalHelper/GuessGhc.hs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'CabalHelper/GuessGhc.hs')

diff --git a/CabalHelper/GuessGhc.hs b/CabalHelper/GuessGhc.hs
index 0827456..8b0ebce 100644
--- a/CabalHelper/GuessGhc.hs
+++ b/CabalHelper/GuessGhc.hs
@@ -49,11 +49,11 @@ guessToolFromGhcPath toolname ghcPath
            path              = ghcPath
            dir               = takeDirectory path
            versionSuffix     = takeVersionSuffix (dropExeExtension path)
-           guessNormal       = dir </> toolname <.> exeExtension
+           guessNormal       = dir </> toolname <.> exeExtension'
            guessGhcVersioned = dir </> (toolname ++ "-ghc" ++ versionSuffix)
-                               <.> exeExtension
+                               <.> exeExtension'
            guessVersioned    = dir </> (toolname ++ versionSuffix)
-                               <.> exeExtension
+                               <.> exeExtension'
            guesses | null versionSuffix = [guessNormal]
                    | otherwise          = [guessGhcVersioned,
                                            guessVersioned,
@@ -70,7 +70,7 @@ guessToolFromGhcPath toolname ghcPath
         dropExeExtension :: FilePath -> FilePath
         dropExeExtension filepath =
           case splitExtension filepath of
-            (filepath', extension) | extension == exeExtension -> filepath'
+            (filepath', extension) | extension == exeExtension' -> filepath'
                                    | otherwise                 -> filepath
 
 -- | @takeWhileEndLE p@ is equivalent to @reverse . takeWhile p . reverse@, but
@@ -81,3 +81,6 @@ takeWhileEndLE p = fst . foldr go ([], False)
     go x (rest, done)
       | not done && p x = (x:rest, False)
       | otherwise = (rest, True)
+
+exeExtension' :: FilePath
+exeExtension' = Distribution.Simple.BuildPaths.exeExtension
-- 
cgit v1.2.3