diff options
| author | Krzysztof Gogolewski <krz.gogolewski@gmail.com> | 2018-08-30 15:34:39 +0200 |
|---|---|---|
| committer | Krzysztof Gogolewski <krz.gogolewski@gmail.com> | 2018-08-30 15:34:39 +0200 |
| commit | 97826e343c482f1c2fb7c74fbbe6958682608ac7 (patch) | |
| tree | 5fc1e38ee543ad6530eb92cf5bf70dd331ebaae0 | |
| parent | f48e276a5ba68d8b6fcb4a558022581fb30f9326 (diff) | |
| download | haskell-97826e343c482f1c2fb7c74fbbe6958682608ac7.tar.gz | |
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
| -rw-r--r-- | compiler/iface/MkIface.hs | 5 | ||||
| -rw-r--r-- | compiler/main/Plugins.hs | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/compiler/iface/MkIface.hs b/compiler/iface/MkIface.hs index 7469c4ec69..59a396e381 100644 --- a/compiler/iface/MkIface.hs +++ b/compiler/iface/MkIface.hs @@ -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 diff --git a/compiler/main/Plugins.hs b/compiler/main/Plugins.hs index 8ead643f49..e83ec08805 100644 --- a/compiler/main/Plugins.hs +++ b/compiler/main/Plugins.hs @@ -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 |