From 2c38147fe73cdca0f8e11387a7ee92b1506e99b9 Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Sat, 26 Jan 2019 18:27:20 +0100 Subject: compile: v2-install --libs needs GHC >=8.0 --- src/CabalHelper/Compiletime/Compile.hs | 1 + src/CabalHelper/Compiletime/Program/GHC.hs | 1 + 2 files changed, 2 insertions(+) (limited to 'src') diff --git a/src/CabalHelper/Compiletime/Compile.hs b/src/CabalHelper/Compiletime/Compile.hs index acdf7cc..3bc959c 100644 --- a/src/CabalHelper/Compiletime/Compile.hs +++ b/src/CabalHelper/Compiletime/Compile.hs @@ -216,6 +216,7 @@ compileHelper' CompHelperEnv {..} = do CabalInstallVersion instVer <- liftIO cabalInstallVersion guard $ instVer >= (Version [2,4,1,0] []) -- ^ didn't test with older versions + guard $ ghcVer >= (GhcVersion (Version [8,0] [])) env@(PackageEnvFile env_file) <- liftIO $ getPrivateCabalPkgEnv ghcVer cabalVer vLog $ logMsg ++ "v2-build package-env " ++ env_file diff --git a/src/CabalHelper/Compiletime/Program/GHC.hs b/src/CabalHelper/Compiletime/Program/GHC.hs index 79dd1b3..b58eab0 100644 --- a/src/CabalHelper/Compiletime/Program/GHC.hs +++ b/src/CabalHelper/Compiletime/Program/GHC.hs @@ -61,6 +61,7 @@ data GhcInvocation = GhcInvocation } newtype GhcVersion = GhcVersion { unGhcVersion :: Version } + deriving (Eq, Ord, Read, Show) showGhcVersion :: GhcVersion -> String showGhcVersion (GhcVersion v) = showVersion v -- cgit v1.2.3