Commit 97826e34 authored by Krzysztof Gogolewski's avatar Krzysztof Gogolewski
Browse files

Fix the __GLASGOW_HASKELL__ comparison

Summary:
GHC 8.4 corresponds to 804, not 840.

Found by Gabor Greif.

Test Plan: Harbormaster

Reviewers: ggreif, bgamari, mpickering

Reviewed By: ggreif

Subscribers: rwbarton, carter

Differential Revision: https://phabricator.haskell.org/D5064
parent f48e276a
......@@ -119,11 +119,10 @@ import Data.IORef
import System.Directory
import System.FilePath
import Plugins ( PluginRecompile(..), Plugin(..), LoadedPlugin(..))
#if __GLASGOW_HASKELL__ < 840
--Qualified import so we can define a Semigroup instance
-- but it doesn't clash with Outputable.<>
import qualified Data.Semigroup
#endif
{-
************************************************************************
......@@ -1113,7 +1112,7 @@ instance Semigroup RecompileRequired where
instance Monoid RecompileRequired where
mempty = UpToDate
#if __GLASGOW_HASKELL__ < 840
#if __GLASGOW_HASKELL__ < 804
mappend = (Data.Semigroup.<>)
#endif
......
......@@ -23,11 +23,9 @@ import Fingerprint
import Data.List
import Outputable (Outputable(..), text, (<+>))
#if __GLASGOW_HASKELL__ < 840
--Qualified import so we can define a Semigroup instance
-- but it doesn't clash with Outputable.<>
import qualified Data.Semigroup
#endif
import Control.Monad
......@@ -125,7 +123,7 @@ instance Semigroup PluginRecompile where
instance Monoid PluginRecompile where
mempty = NoForceRecompile
#if __GLASGOW_HASKELL__ < 840
#if __GLASGOW_HASKELL__ < 804
mappend = (Data.Semigroup.<>)
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment