From 1fbc090874cc9631cc54898b0af58583ce35bc29 Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Sun, 12 Aug 2018 04:31:35 +0200 Subject: Add Cabal 2.4 support --- lib/Distribution/Helper.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/Distribution') diff --git a/lib/Distribution/Helper.hs b/lib/Distribution/Helper.hs index 3a49031..1a5740b 100644 --- a/lib/Distribution/Helper.hs +++ b/lib/Distribution/Helper.hs @@ -113,7 +113,7 @@ import Data.Version import Data.Typeable import Data.Function import Data.Functor.Apply -import Distribution.Simple.BuildPaths (exeExtension) +import Distribution.System (buildOS, OS(Windows)) import System.Environment import System.FilePath hiding ((<.>)) import qualified System.FilePath as FP @@ -584,4 +584,6 @@ lookupEnv' :: String -> IO (Maybe String) lookupEnv' k = lookup k <$> getEnvironment exeExtension' :: FilePath -exeExtension' = Distribution.Simple.BuildPaths.exeExtension +exeExtension' + | Windows <- buildOS = "exe" + | otherwise = "" -- cgit v1.2.3