diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-02-23 10:28:13 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-02-23 10:28:13 -0500 |
| commit | 844c0c47a223e2e1bb3767afc05639269dad8ee9 (patch) | |
| tree | c5603db417765a909081a564859004b2d4e0b9dd /haddock-api | |
| parent | e185254b6cb8a7811eeed1f993612c90b2ff757e (diff) | |
| parent | 59932f1749394fedc3533bea1474bc9e207824e1 (diff) | |
Merge remote-tracking branch 'upstream/ghc-head' into HEAD
Diffstat (limited to 'haddock-api')
| -rw-r--r-- | haddock-api/haddock-api.cabal | 1 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/InterfaceFile.hs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal index 5eb69345..2c892de6 100644 --- a/haddock-api/haddock-api.cabal +++ b/haddock-api/haddock-api.cabal @@ -13,6 +13,7 @@ bug-reports: https://github.com/haskell/haddock/issues copyright: (c) Simon Marlow, David Waern category: Documentation build-type: Simple +tested-with: GHC==8.10.*, GHC==8.8.1, GHC==8.6.5 extra-source-files: CHANGES.md diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs index 4890a937..be9f4293 100644 --- a/haddock-api/src/Haddock/InterfaceFile.hs +++ b/haddock-api/src/Haddock/InterfaceFile.hs @@ -82,7 +82,7 @@ binaryInterfaceMagic = 0xD0Cface -- (2) set `binaryInterfaceVersionCompatibility` to [binaryInterfaceVersion] -- binaryInterfaceVersion :: Word16 -#if (__GLASGOW_HASKELL__ >= 811) && (__GLASGOW_HASKELL__ < 813) +#if MIN_VERSION_ghc(8,11,0) && !MIN_VERSION_ghc(8,13,0) binaryInterfaceVersion = 34 binaryInterfaceVersionCompatibility :: [Word16] |