[commit: haddock] T6018-injective-type-families, adamse-D1033, ghc-head, master, wip/10268, wip/10313, wip/D538, wip/D538-1, wip/D538-2, wip/D538-3, wip/D538-4, wip/D538-5, wip/D538-6, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T9840, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3, wip/orf-reboot: Treat GHC 7.10 the same as GHC 7.9 (8cd72a0)

git at git.haskell.org git at git.haskell.org
Wed Jul 8 08:35:02 UTC 2015


Repository : ssh://git@git.haskell.org/haddock

On branches: T6018-injective-type-families,adamse-D1033,ghc-head,master,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/8cd72a05e857388e3ca184fbef3f04d3bffbc5b4

>---------------------------------------------------------------

commit 8cd72a05e857388e3ca184fbef3f04d3bffbc5b4
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 14 10:17:06 2014 +0100

    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


>---------------------------------------------------------------

8cd72a05e857388e3ca184fbef3f04d3bffbc5b4
 haddock-api/src/Haddock/InterfaceFile.hs | 2 +-
 haddock.cabal                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs
index ad00635..b0df549 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 8153af1..fbb4bfe 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
 



More information about the ghc-commits mailing list