diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2009-01-05 19:27:57 +0000 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2009-01-05 19:27:57 +0000 |
| commit | 709b34386e3866ae73a9ff1220a969188feacbfa (patch) | |
| tree | 92a7735b75311e7e1dcc021e0b28007c8fa580a8 /utils/ext-core | |
| parent | 7ee35159446d22f0054fb9450f8fa20b43e10600 (diff) | |
| download | haskell-709b34386e3866ae73a9ff1220a969188feacbfa.tar.gz | |
ext-core: change .cabal file so we can build with either GHC 6.8 or 6.10
Diffstat (limited to 'utils/ext-core')
| -rw-r--r-- | utils/ext-core/Setup.lhs | 16 | ||||
| -rw-r--r-- | utils/ext-core/extcore.cabal | 21 |
2 files changed, 25 insertions, 12 deletions
diff --git a/utils/ext-core/Setup.lhs b/utils/ext-core/Setup.lhs index 12d5bc5e6b..35661d4b2a 100644 --- 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 0b62cef488..5a6b7dc5f2 100644 --- 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 + } +} |