From b6ebb3588358ee1bbd4b2cc114aa6650d14baaff Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Wed, 25 Oct 2017 18:05:18 +0200 Subject: Fix compilation error on GHC 7.{4,6,8} --- src/CabalHelper/Runtime/Main.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CabalHelper/Runtime/Main.hs b/src/CabalHelper/Runtime/Main.hs index 4ef8763..2030023 100644 --- a/src/CabalHelper/Runtime/Main.hs +++ b/src/CabalHelper/Runtime/Main.hs @@ -587,16 +587,18 @@ renderGhcOptions' :: LocalBuildInfo -> Verbosity -> GhcOptions -> IO [String] -renderGhcOptions' lbi _v opts = do #if !CH_MIN_VERSION_Cabal(1,20,0) +renderGhcOptions' lbi v opts = do -- CPP < 1.20 (ghcProg, _) <- requireProgram v ghcProgram (withPrograms lbi) let Just ghcVer = programVersion ghcProg return $ renderGhcOptions ghcVer opts #elif CH_MIN_VERSION_Cabal(1,20,0) && !CH_MIN_VERSION_Cabal(1,24,0) +renderGhcOptions' lbi _v opts = do -- CPP >= 1.20 && < 1.24 return $ renderGhcOptions (compiler lbi) opts #else +renderGhcOptions' lbi _v opts = do -- CPP >= 1.24 return $ renderGhcOptions (compiler lbi) (hostPlatform lbi) opts #endif -- cgit v1.2.3