aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-12-14 10:17:06 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2014-12-14 10:17:06 +0100
commit8cd72a05e857388e3ca184fbef3f04d3bffbc5b4 (patch)
tree097c913a2171c245f240afe718f64e43ff972f93
parentb4b82e84099196ff22762e90922aea48671781a2 (diff)
Treat GHC 7.10 the same as GHC 7.9
...since the current GHC 7.9 is going to become GHC 7.10 real-soon-now anyway
-rw-r--r--haddock-api/src/Haddock/InterfaceFile.hs2
-rw-r--r--haddock.cabal2
2 files changed, 2 insertions, 2 deletions
diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs
index ad006353..b0df5491 100644
--- a/haddock-api/src/Haddock/InterfaceFile.hs
+++ b/haddock-api/src/Haddock/InterfaceFile.hs
@@ -76,7 +76,7 @@ binaryInterfaceMagic = 0xD0Cface
-- (2) set `binaryInterfaceVersionCompatibility` to [binaryInterfaceVersion]
--
binaryInterfaceVersion :: Word16
-#if __GLASGOW_HASKELL__ == 709
+#if (__GLASGOW_HASKELL__ >= 709) && (__GLASGOW_HASKELL__ < 711)
binaryInterfaceVersion = 27
binaryInterfaceVersionCompatibility :: [Word16]
diff --git a/haddock.cabal b/haddock.cabal
index 8153af1b..fbb4bfed 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -57,7 +57,7 @@ executable haddock
array,
xhtml >= 3000.2 && < 3000.3,
Cabal >= 1.10,
- ghc == 7.9.*,
+ ghc >= 7.9 && < 7.11,
bytestring,
transformers