[project @ 2004-11-18 00:56:18 by igloo]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 1cf49d9..1a61d1f 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -283,7 +283,7 @@ endif
 ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 
 # Yes, include the interepreter, readline, and Template Haskell extensions
-SRC_HC_OPTS += -DGHCI -package template-haskell
+SRC_HC_OPTS += -DGHCI -package template-haskell -package Cabal
 
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 SRC_HC_OPTS += -package unix
@@ -507,15 +507,28 @@ primop-usage.hs-incl: prelude/primops.txt
 #-----------------------------------------------------------------------------
 #              Linking
 
-# Include libghccompat in stage1.  In stage2 onwards, all these libraries
-# will be available from the main libraries.
+# Include libghccompat in stage1 only.  In stage2 onwards, all these
+# libraries will be available from the main libraries.
 ifeq "$(stage)" "1"
 SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR)
 SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat
-SRC_MKDEPENDHS_OPTS += -optdep--exclude-module=Compat.RawSystem
+
+ifeq "$(Windows)" "YES"
+# not very nice, but required for -lghccompat on Windows
+SRC_LD_OPTS += -lshell32
+endif
+
+# This is horrible.  We ought to be able to omit the entire directory
+# from mkDependHS.
+SRC_MKDEPENDHS_OPTS += \
+       -optdep--exclude-module=Compat.RawSystem \
+       -optdep--exclude-module=Data.Version \
+       -optdep--exclude-module=Distribution.Package \
+       -optdep--exclude-module=Distribution.InstalledPackageInfo \
+       -optdep--exclude-module=Distribution.Package
 endif
 
-SRC_LD_OPTS += -no-link-chk 
+SRC_LD_OPTS += -no-link-chk
 
 # -----------------------------------------------------------------------------
 # create ghc-inplace, a convenient way to run ghc from the build tree...