-package Cabal is required whenever $(bootstrapped) is yes, not only
for bootstrapped compiles with GHCi.
ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
# Yes, include the interepreter, readline, and Template Haskell extensions
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
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
SRC_HC_OPTS += -package unix
endif # bootstrapped with interpreter
endif # bootstrapped with interpreter
+ifeq "$(bootstrapped)" "YES"
+SRC_HC_OPTS += -package Cabal
+endif
+
# -----------------------------------------------
# mkdependC stuff
#
# -----------------------------------------------
# mkdependC stuff
#