aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2019-01-26 18:27:20 +0100
committerDaniel Gröber <dxld@darkboxed.org>2019-01-26 19:28:37 +0100
commit2c38147fe73cdca0f8e11387a7ee92b1506e99b9 (patch)
tree4a7b183ddd4ea01bf3a663058f5db5f1bdf93762 /src
parent3486b4addcec20f881a85d99aa37c2701c108c08 (diff)
compile: v2-install --libs needs GHC >=8.0
Diffstat (limited to 'src')
-rw-r--r--src/CabalHelper/Compiletime/Compile.hs1
-rw-r--r--src/CabalHelper/Compiletime/Program/GHC.hs1
2 files changed, 2 insertions, 0 deletions
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