X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.cabal;h=9d589f4bb7c26a1e3998106de18408566d4baa1b;hb=2cb427f4cfdf4c4bc898665250d4ff0d75e3828f;hp=1d3df5459d46934b4e7d9cb06293576a2dd9c44f;hpb=9412e62942ebab0599c7fb0b358a9d4869647b67;p=ghc-hetmet.git

diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal
index 1d3df54..9d589f4 100644
--- a/compiler/ghc.cabal
+++ b/compiler/ghc.cabal
@@ -33,6 +33,8 @@ Flag windows
     Description: On a Windows machine
 
 Library
+    Exposed: False
+
     if flag(base3)
         Build-Depends: base       >= 3   && < 4,
                        directory  >= 1   && < 1.1,
@@ -61,6 +63,10 @@ Library
         CPP-Options: -DGHCI
         Include-Dirs: ../libffi/build/include
 
+    -- GHC 6.4.2 needs to be able to find WCsubst.c, which needs to be
+    -- able to find WCsubst.h
+    Include-Dirs: ../libraries/base/cbits, ../libraries/base/include
+
     Extensions: CPP, MagicHash, UnboxedTuples, PatternGuards,
                 ForeignFunctionInterface, EmptyDataDecls,
                 TypeSynonymInstances, MultiParamTypeClasses,
@@ -68,12 +74,10 @@ Library
 
     Include-Dirs: . parser utils
 
-    -- XXX Change these directory names: The stage2 files are what
-    --     we want for all stages >= 1
     if flag(stage1)
         Include-Dirs: stage1
     else
-        Include-Dirs: stage2
+        Include-Dirs: stage2plus
     Install-Includes: HsVersions.h, ghc_boot_platform.h
 
     c-sources:
@@ -116,6 +120,7 @@ Library
         BasicTypes
         DataCon
         Demand
+        Exception
         Id
         IdInfo
         Literal