Fix the stage3 build

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

diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal
index 1d3df54..0798086 100644 (file)
--- a/compiler/ghc.cabal
+++ b/compiler/ghc.cabal
@@ -61,6 +61,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 +72,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: