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

diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal
index 1d3df54..735e8fb 100644
--- a/compiler/ghc.cabal
+++ b/compiler/ghc.cabal
@@ -29,10 +29,9 @@ Flag ghci
 Flag stage1
     Description: Is this stage 1?
 
-Flag windows
-    Description: On a Windows machine
-
 Library
+    Exposed: False
+
     if flag(base3)
         Build-Depends: base       >= 3   && < 4,
                        directory  >= 1   && < 1.1,
@@ -45,7 +44,7 @@ Library
         Build-Depends: base < 3
     Build-Depends: filepath >= 1 && < 1.2
     Build-Depends: haskell98, Cabal, hpc
-    if flag(windows)
+    if os(windows)
         Build-Depends: Win32
     else
         Build-Depends: unix
@@ -61,6 +60,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 +71,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 +117,7 @@ Library
         BasicTypes
         DataCon
         Demand
+        Exception
         Id
         IdInfo
         Literal
@@ -205,6 +207,7 @@ Library
         CoreUnfold
         CoreUtils
         ExternalCore
+        MkCore
         MkExternalCore
         PprCore
         PprExternalCore