ext-core: change .cabal file so we can build with either GHC 6.8 or 6.10

diff --git a/utils/ext-core/Setup.lhs b/utils/ext-core/Setup.lhs
index 12d5bc5..35661d4 100644 (file)
--- a/utils/ext-core/Setup.lhs
+++ b/utils/ext-core/Setup.lhs
@@ -1,8 +1,7 @@
 #!/usr/bin/env runhaskell
 \begin{code}
-{-# OPTIONS -Wall #-}
+{-# OPTIONS -Wall -cpp #-}
 
-import Control.Exception
 import Control.Monad
 import Distribution.PackageDescription
 import Distribution.Simple
@@ -12,7 +11,7 @@ import System.Cmd
 import System.FilePath
 import System.Exit
 import System.Directory
-import Control.Exception (try)
+import Control.Exception
 
 main :: IO ()
 main = do
@@ -58,7 +57,12 @@ maybeUpdateFile source target = do
   r <- rawSystem "cmp" ["-s" {-quiet-}, source, target]
   case r of
     ExitSuccess   -> removeFile source
-    ExitFailure _ -> do (try :: IO () -> IO (Either IOException ())) (removeFile target); renameFile source target
-
-
+    ExitFailure _ -> do 
+#if __GLASGOW_HASKELL__ >= 610
+      (try :: IO () -> IO (Either IOException ()))
+#else
+      try
+#endif 
+       (removeFile target)
+      renameFile source target
 \end{code}
\ No newline at end of file

diff --git a/utils/ext-core/extcore.cabal b/utils/ext-core/extcore.cabal
index 0b62cef..5a6b7dc 100644 (file)
--- a/utils/ext-core/extcore.cabal
+++ b/utils/ext-core/extcore.cabal
@@ -8,12 +8,21 @@ license-file:        LICENSE
 author:              Andrew Tolmach, Tim Chevalier, The GHC Team
 maintainer:          chevalier@alum.wellesley.edu
 stability:           alpha
-build-depends:       base, containers, directory, filepath, mtl, parsec, pretty, syb
-exposed-modules:     Language.Core.Check, Language.Core.Dependencies, Language.Core.Core, Language.Core.Interp, Language.Core.Overrides, Language.Core.ParsecParser, Language.Core.Prep, Language.Core.Prims, Language.Core.Printer, Language.Core.Merge, Language.Core.ElimDeadCode, Language.Core.Encoding, Language.Core.Env
-other-modules:       Language.Core.PrimCoercions, Language.Core.PrimEnv, Language.Core.Utils, Language.Core.CoreUtils, Language.Core.Environments
-extensions:          DeriveDataTypeable PatternGuards RankNTypes ScopedTypeVariables
-ghc-options:         -Wall -O2
-tested-with:         GHC ==6.8.2
+tested-with:         GHC ==6.8.2, GHC==6.10.1
 data-files:          README
 build-type:          Simple
+cabal-version:       >=1.2
+Library {
+  exposed-modules:     Language.Core.Check, Language.Core.Dependencies, Language.Core.Core, Language.Core.Interp, Language.Core.Overrides, Language.Core.ParsecParser, Language.Core.Prep, Language.Core.Prims, Language.Core.Printer, Language.Core.Merge, Language.Core.ElimDeadCode, Language.Core.Encoding, Language.Core.Env
+  other-modules:       Language.Core.PrimCoercions, Language.Core.PrimEnv, Language.Core.Utils, Language.Core.CoreUtils, Language.Core.Environments
+  extensions:          DeriveDataTypeable PatternGuards RankNTypes ScopedTypeVariables
+  ghc-options:         -Wall -O2
+  build-depends:       base, containers, directory, filepath, mtl, parsec, pretty
+  if impl(ghc > 6.8.2) {
+     build-depends:syb
+  }
+  else {
+     extensions: PatternSignatures
+  }
+}