diff options
| author | John J. Camilleri <john@digitalgrammars.com> | 2018-12-04 10:31:53 +0100 |
|---|---|---|
| committer | John J. Camilleri <john@digitalgrammars.com> | 2018-12-04 10:31:53 +0100 |
| commit | ee5ac81dfcd8856ca64c6a6aa65c6e47a3214da9 (patch) | |
| tree | 61a905b0edaef95693fcd79a56cf17340293c505 | |
| parent | 1a842efeafaaedd1dfe67bdcc3d367a8595d2a2b (diff) | |
Make GF compile with GHC 8.6.2
- Re-implement `Distribution.Simple.BuildPaths.exeExtension`
- Turn off `MonadFailDesugaring`
Tested with GHC:
- 7.10.3
- 8.0.2
- 8.2.2
- 8.4.3
- 8.6.2
Yay Stack!
| -rw-r--r-- | Setup.hs | 5 | ||||
| -rw-r--r-- | gf.cabal | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,4 @@ +import Distribution.System(Platform(..),OS(..)) import Distribution.Simple(defaultMainWithHooks,UserHooks(..),simpleUserHooks) import Distribution.Simple.LocalBuildInfo(LocalBuildInfo(..),absoluteInstallDirs,datadir) import Distribution.Simple.Setup(BuildFlags(..),Flag(..),InstallFlags(..),CopyDest(..),CopyFlags(..),SDistFlags(..)) @@ -73,5 +74,9 @@ dataDirFile = "DATA_DIR" default_gf :: LocalBuildInfo -> FilePath default_gf lbi = buildDir lbi </> exeName' </> exeNameReal where + -- shadows Distribution.Simple.BuildPaths.exeExtension, which changed type signature in Cabal 2.4 + exeExtension = case hostPlatform lbi of + Platform arch Windows -> "exe" + _ -> "" exeName' = "gf" exeNameReal = exeName' <.> exeExtension @@ -98,6 +98,7 @@ Library -- ghc-options: +RTS -A20M -RTS ghc-prof-options: -fprof-auto extensions: + NoMonadFailDesugaring exposed-modules: PGF |
