X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fghc-bin.cabal.in;h=61b7b340acff33cb67ac6b1eb088e5ae2e72ec9e;hb=f3a77b2f46ebc27716f45ae426a3b33b853d52f5;hp=df3b515386e4c44b009067c8975c72ae785219bc;hpb=46aed8a4a084add708bbd119d19905105d5f0d72;p=ghc-hetmet.git

diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index df3b515..61b7b34 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -14,33 +14,31 @@ Description:
         XXX
 Category: XXX
 Data-Dir: ..
-Data-Files: extra-gcc-opts
+Data-Files: settings
 Build-Type: Simple
 Cabal-Version: >= 1.2
 
-Flag base3
-    Description: Choose the new smaller, split-up base package.
-
 Flag ghci
     Description: Build GHCi support.
+    Default: False
+    Manual: True
 
 Executable ghc
     Main-Is: Main.hs
-    if flag(base3)
-        Build-Depends: base       >= 3   && < 5,
-                       array      >= 0.1 && < 0.3,
-                       bytestring >= 0.9 && < 0.10,
-                       directory  >= 1   && < 1.1,
-                       process    >= 1   && < 1.1
-    else
-        Build-Depends: base < 3
-    Build-Depends: base, ghc
-    Build-Depends: filepath >= 1 && < 1.2
+    Build-Depends: base       >= 3   && < 5,
+                   array      >= 0.1 && < 0.4,
+                   bytestring >= 0.9 && < 0.10,
+                   directory  >= 1   && < 1.2,
+                   process    >= 1   && < 1.1,
+                   filepath   >= 1   && < 1.3,
+                   ghc
     if os(windows)
         Build-Depends: Win32
     else
         Build-Depends: unix
 
+    C-Sources: hschooks.c
+
     GHC-Options: -Wall
     if flag(ghci)
         CPP-Options: -DGHCI
@@ -53,4 +51,6 @@ Executable ghc
                     MagicHash
 
     Extensions: CPP, PatternGuards
+    if impl(ghc >= 7.1)
+        Extensions: NondecreasingIndentation