[project @ 2005-01-12 23:52:17 by wolfgang]

-package Cabal is required whenever $(bootstrapped) is yes, not only
for bootstrapped compiles with GHCi.

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 69adbaf..83d69db 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -282,7 +282,7 @@ endif
 ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 
 # Yes, include the interepreter, readline, and Template Haskell extensions
-SRC_HC_OPTS += -DGHCI -package template-haskell -package Cabal
+SRC_HC_OPTS += -DGHCI -package template-haskell
 
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 SRC_HC_OPTS += -package unix
@@ -316,6 +316,10 @@ EXCLUDED_SRCS += deSugar/DsMeta.hs typecheck/TcSplice.lhs hsSyn/Convert.lhs
 
 endif # bootstrapped with interpreter
 
+ifeq "$(bootstrapped)" "YES"
+SRC_HC_OPTS += -package Cabal
+endif
+
 # -----------------------------------------------
 # mkdependC stuff
 #