diff options
| author | David Waern <david.waern@gmail.com> | 2011-12-27 13:57:32 +0100 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2011-12-27 13:57:32 +0100 |
| commit | 15c65be1ef48f1b8adb3f0c8b66075b2b1a698f3 (patch) | |
| tree | 995ec43f22232edcb45169f0056122d81dd3f5b0 | |
| parent | 2e184f1db4db0a13c658cef607ca26365d5b44f1 (diff) | |
| parent | 12e619d5b00d205443768c224da2bfb045569590 (diff) | |
Merge ../ghc/utils/haddock
| -rw-r--r-- | haddock.cabal | 18 | ||||
| -rw-r--r-- | src/Haddock/InterfaceFile.hs | 4 |
2 files changed, 16 insertions, 6 deletions
diff --git a/haddock.cabal b/haddock.cabal index 49534b33..3f186299 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -78,9 +78,12 @@ flag test executable haddock default-language: Haskell2010 - build-tools: alex >= 2.3, happy >= 1.18 + -- In a GHC tree - in particular, in a source tarball - we don't + -- require alex or happy + if !flag(in-ghc-tree) + build-tools: alex >= 2.3, happy >= 1.18 build-depends: - base >= 4.3 && < 4.5, + base >= 4.3 && < 4.6, filepath, directory, pretty, @@ -88,7 +91,7 @@ executable haddock array, xhtml >= 3000.2 && < 3000.3, Cabal >= 1.10, - ghc >= 7.2 && < 7.4 + ghc >= 7.2 && < 7.6 if flag(in-ghc-tree) cpp-options: -DIN_GHC_TREE @@ -137,9 +140,12 @@ executable haddock library default-language: Haskell2010 - build-tools: alex >= 2.3, happy >= 1.18 + -- In a GHC tree - in particular, in a source tarball - we don't + -- require alex or happy + if !flag(in-ghc-tree) + build-tools: alex >= 2.3, happy >= 1.18 build-depends: - base >= 4.3 && < 4.5, + base >= 4.3 && < 4.6, filepath, directory, pretty, @@ -147,7 +153,7 @@ library array, xhtml >= 3000.2 && < 3000.3, Cabal >= 1.10, - ghc >= 7.2 && < 7.4 + ghc >= 7.2 && < 7.6 if flag(in-ghc-tree) cpp-options: -DIN_GHC_TREE diff --git a/src/Haddock/InterfaceFile.hs b/src/Haddock/InterfaceFile.hs index 21179885..fcf7fe65 100644 --- a/src/Haddock/InterfaceFile.hs +++ b/src/Haddock/InterfaceFile.hs @@ -68,6 +68,10 @@ binaryInterfaceVersion :: Word16 binaryInterfaceVersion = 19 #elif __GLASGOW_HASKELL__ == 703 binaryInterfaceVersion = 19 +#elif __GLASGOW_HASKELL__ == 704 +binaryInterfaceVersion = 19 +#elif __GLASGOW_HASKELL__ == 705 +binaryInterfaceVersion = 19 #else #error Unknown GHC version #endif |