Fix Trac #1470: improve handling of recursive instances (needed for SYB3)

[ghc-hetmet.git] / compiler / ghc.cabal

diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal
index b1de64e..ce02408 100644 (file)
--- a/compiler/ghc.cabal
+++ b/compiler/ghc.cabal
@@ -3,7 +3,7 @@ Name: ghc
 Version: 6.9
 Copyright: XXX
 -- License: XXX
-License-File: XXX
+License-File: ../LICENSE
 Author: XXX
 Maintainer: glasgow-haskell-users@haskell.org
 Homepage: http://www.haskell.org/ghc/
@@ -22,15 +22,23 @@ Flag base3
 
 Flag dynlibs
     Description: Dynamic library support
+    Default: False
+    Manual: True
 
 Flag editline
     Description: Use editline
+    Default: False
+    Manual: True
 
 Flag ghci
     Description: Build GHCi support.
+    Default: False
+    Manual: True
 
 Flag ncg
     Description: Build the NCG.
+    Default: False
+    Manual: True
 
 Flag stage1
     Description: Is this stage 1?
@@ -45,10 +53,6 @@ Library
     if !flag(base3) && !flag(base4)
         Build-Depends: base       < 3
 
-    if flag(base4)
-        Build-Depends: concurrent >= 0.1 && < 0.2,
-                       st         >= 0.1 && < 0.2
-
     if flag(base3) || flag(base4)
         Build-Depends: directory  >= 1   && < 1.1,
                        process    >= 1   && < 1.1,
@@ -85,12 +89,14 @@ Library
     Extensions: CPP, MagicHash, UnboxedTuples, PatternGuards,
                 ForeignFunctionInterface, EmptyDataDecls,
                 TypeSynonymInstances, MultiParamTypeClasses,
-                FlexibleInstances, Rank2Types, PatternSignatures
+                FlexibleInstances, Rank2Types, ScopedTypeVariables
 
     Include-Dirs: . parser utils
 
     if flag(stage1)
         Include-Dirs: stage1
+       if impl(ghc < 6.9)
+           Extensions: PatternSignatures
     else
         Include-Dirs: stage2plus
     Install-Includes: HsVersions.h, ghc_boot_platform.h
@@ -284,6 +290,7 @@ Library
         ParsePkgConf
         PprTyThing
         StaticFlags
+        StaticFlagParser
         SysTools
         TidyPgm
         Ctype