X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=d84bb2d21849d4bcfe515b653bb6691b30d8483a;hb=e746656557c29fee770de7e58006bbf9e8c67fc6;hp=376c15bc7198ff031ccc1dc8e603b1ac8ee11526;hpb=f794b53658a22a1464db7168f9821c194bcf5268;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index 376c15b..d84bb2d 100644
--- a/base.cabal
+++ b/base.cabal
@@ -9,18 +9,15 @@ description:
     and a large collection of useful libraries ranging from data
     structures to parsing combinators and debugging utilities.
 cabal-version:  >=1.2
-build-type: Custom
+build-type: Configure
 extra-tmp-files:
                 config.log config.status autom4te.cache
                 include/HsBaseConfig.h
 
 
 Library {
-    -- This is actually something of a hack, as if we are using
-    -- GHC and we don't have an rts package for some reason, we
-    -- actually ought to fail.
     if impl(ghc) {
-        build-depends: rts
+        build-depends: rts, ghc-prim, integer
         exposed-modules:
             Data.Generics,
             Data.Generics.Aliases,
@@ -34,6 +31,7 @@ Library {
             GHC.Base,
             GHC.Conc,
             GHC.ConsoleHandler,
+            GHC.Desugar,
             GHC.Dotnet,
             GHC.Enum,
             GHC.Environment,
@@ -50,8 +48,6 @@ Library {
             GHC.Num,
             GHC.PArr,
             GHC.Pack,
-            GHC.Prim,
-            GHC.PrimopWrappers,
             GHC.Ptr,
             GHC.Read,
             GHC.Real,
@@ -65,6 +61,12 @@ Library {
             GHC.Weak,
             GHC.Word,
             System.Timeout
+        extensions: MagicHash, ExistentialQuantification, Rank2Types,
+                    ScopedTypeVariables, UnboxedTuples,
+                    ForeignFunctionInterface, UnliftedFFITypes,
+                    DeriveDataTypeable, GeneralizedNewtypeDeriving,
+                    FlexibleInstances, PatternSignatures, StandaloneDeriving,
+                    PatternGuards
     }
     exposed-modules:
         Control.Applicative,
@@ -77,6 +79,7 @@ Library {
         Control.Concurrent.QSemN,
         Control.Concurrent.SampleVar,
         Control.Exception,
+        Control.OldException,
         Control.Monad,
         Control.Monad.Fix,
         Control.Monad.Instances,
@@ -158,19 +161,16 @@ Library {
         cbits/consUtils.c
         cbits/dirUtils.c
         cbits/inputReady.c
-        cbits/lockFile.c
-        cbits/longlong.c
         cbits/selectUtils.c
     include-dirs: include
     includes:    HsBase.h
-    install-includes:    HsBase.h HsBaseConfig.h WCsubst.h dirUtils.h lockFile.h consUtils.h Typeable.h
+    install-includes:    HsBase.h HsBaseConfig.h WCsubst.h dirUtils.h consUtils.h Typeable.h
     if os(windows) {
         extra-libraries: wsock32, msvcrt, kernel32, user32, shell32
     }
-    extensions:    CPP
-    -- XXX is there an extension for using # in varids?
+    extensions: CPP
     -- We need to set the package name to base (without a version number)
     -- as it's magic.
-    ghc-options: -fglasgow-exts -package-name base
+    ghc-options: -package-name base
     nhc98-options: -H4M -K3M
 }