The bootstrapping compiler is now required to be > 609

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 4d69762..8bb16d1 100644 (file)
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -104,9 +104,6 @@ Library
 
     if flag(stage1)
         Include-Dirs: stage1
-        if impl(ghc < 6.9)
-            Build-Depends: extensible-exceptions
-            Extensions: PatternSignatures
     else
         if flag(stage2)
             Include-Dirs: stage2

diff --git a/compiler/specialise/SpecConstr.lhs b/compiler/specialise/SpecConstr.lhs
index ad522e9..3a7e221 100644 (file)
--- a/compiler/specialise/SpecConstr.lhs
+++ b/compiler/specialise/SpecConstr.lhs
@@ -50,11 +50,7 @@ import UniqFM
 import MonadUtils
 import Control.Monad   ( zipWithM )
 import Data.List
-#if __GLASGOW_HASKELL__ > 609
 import Data.Data        ( Data, Typeable )
-#else
-import Data.Generics    ( Data, Typeable )
-#endif
 \end{code}
 
 -----------------------------------------------------

diff --git a/compiler/utils/Exception.hs b/compiler/utils/Exception.hs
index 3c76005..63d6121 100644 (file)
--- a/compiler/utils/Exception.hs
+++ b/compiler/utils/Exception.hs
@@ -8,11 +8,7 @@ module Exception
 
 import Prelude hiding (catch)
 
-#if __GLASGOW_HASKELL__ < 609
-import Control.Exception.Extensible as Control.Exception
-#else
 import Control.Exception
-#endif
 
 catchIO :: IO a -> (IOException -> IO a) -> IO a
 catchIO = catch

diff --git a/compiler/utils/Serialized.hs b/compiler/utils/Serialized.hs
index 915ca22..95a09b9 100644 (file)
--- a/compiler/utils/Serialized.hs
+++ b/compiler/utils/Serialized.hs
@@ -24,11 +24,7 @@ import Util
 import Data.Bits
 import Data.Word        ( Word8 )
 
-#if __GLASGOW_HASKELL__ > 609
 import Data.Data
-#else
-import Data.Generics
-#endif
 
 
 -- | Represents a serialized value of a particular type. Attempts can be made to deserialize it at certain types