Fix build with 6.10

diff --git a/compiler/cmm/CmmBuildInfoTables.hs b/compiler/cmm/CmmBuildInfoTables.hs
index c4a16d3..0ba8cc0 100644 (file)
--- a/compiler/cmm/CmmBuildInfoTables.hs
+++ b/compiler/cmm/CmmBuildInfoTables.hs
@@ -1,4 +1,6 @@
+#if __GLASGOW_HASKELL__ >= 611
 {-# OPTIONS_GHC -XNoMonoLocalBinds #-}
+#endif
 -- Norman likes local bindings
 -- If this module lives on I'd like to get rid of this flag in due course
 

diff --git a/compiler/cmm/CmmCPSZ.hs b/compiler/cmm/CmmCPSZ.hs
index e72d3f2..fa568af 100644 (file)
--- a/compiler/cmm/CmmCPSZ.hs
+++ b/compiler/cmm/CmmCPSZ.hs
@@ -1,4 +1,6 @@
+#if __GLASGOW_HASKELL__ >= 611
 {-# OPTIONS_GHC -XNoMonoLocalBinds #-}
+#endif
 -- Norman likes local bindings
 -- If this module lives on I'd like to get rid of this flag in due course
 

diff --git a/compiler/cmm/CmmSpillReload.hs b/compiler/cmm/CmmSpillReload.hs
index c457383..a8839a8 100644 (file)
--- a/compiler/cmm/CmmSpillReload.hs
+++ b/compiler/cmm/CmmSpillReload.hs
@@ -1,4 +1,6 @@
+#if __GLASGOW_HASKELL__ >= 611
 {-# OPTIONS_GHC -XNoMonoLocalBinds #-}
+#endif
 -- Norman likes local bindings
 -- If this module lives on I'd like to get rid of this flag in due course
 

diff --git a/compiler/cmm/CmmStackLayout.hs b/compiler/cmm/CmmStackLayout.hs
index a62580b..dedb6b0 100644 (file)
--- a/compiler/cmm/CmmStackLayout.hs
+++ b/compiler/cmm/CmmStackLayout.hs
@@ -1,4 +1,6 @@
+#if __GLASGOW_HASKELL__ >= 611
 {-# OPTIONS_GHC -XNoMonoLocalBinds #-}
+#endif
 -- Norman likes local bindings
 -- If this module lives on I'd like to get rid of this flag in due course
 

diff --git a/compiler/cmm/ZipCfgCmmRep.hs b/compiler/cmm/ZipCfgCmmRep.hs
index 1377e2f..b2328be 100644 (file)
--- a/compiler/cmm/ZipCfgCmmRep.hs
+++ b/compiler/cmm/ZipCfgCmmRep.hs
@@ -1,4 +1,6 @@
+#if __GLASGOW_HASKELL__ >= 611
 {-# OPTIONS_GHC -XNoMonoLocalBinds #-}
+#endif
 -- Norman likes local bindings
 
 -- This module is pure representation and should be imported only by

diff --git a/compiler/typecheck/FamInst.lhs b/compiler/typecheck/FamInst.lhs
index e2da795..36f78cb 100644 (file)
--- a/compiler/typecheck/FamInst.lhs
+++ b/compiler/typecheck/FamInst.lhs
@@ -8,7 +8,6 @@ module FamInst (
 import HscTypes
 import FamInstEnv
 import TcMType
-import TcType
 import TcRnMonad
 import TyCon
 import Name

diff --git a/compiler/typecheck/TcSMonad.lhs b/compiler/typecheck/TcSMonad.lhs
index 73a7229..2524afc 100644 (file)
--- a/compiler/typecheck/TcSMonad.lhs
+++ b/compiler/typecheck/TcSMonad.lhs
@@ -64,7 +64,6 @@ module TcSMonad (
 import HscTypes
 import BasicTypes 
 import Type
-import TcRnTypes
 
 import Inst
 import InstEnv 
@@ -96,6 +95,8 @@ import HsBinds               -- for TcEvBinds stuff
 import Id 
 import FunDeps
 
+import TcRnTypes
+
 import Control.Monad
 import Data.IORef
 \end{code}

diff --git a/compiler/vectorise/Vectorise/Type/Env.hs b/compiler/vectorise/Vectorise/Type/Env.hs
index 18de832..8e26ed9 100644 (file)
--- a/compiler/vectorise/Vectorise/Type/Env.hs
+++ b/compiler/vectorise/Vectorise/Type/Env.hs
@@ -1,4 +1,7 @@
-{-# OPTIONS_GHC -XNoMonoLocalBinds -fno-warn-missing-signatures #-}
+{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
+#if __GLASGOW_HASKELL__ >= 611
+{-# OPTIONS_GHC -XNoMonoLocalBinds #-}
+#endif
 -- Roman likes local bindings
 -- If this module lives on I'd like to get rid of this flag in due course