# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.101 2000/10/27 16:30:02 simonmar Exp $
+# $Id: Makefile,v 1.114 2000/11/16 11:39:36 simonmar Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
@echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS)
@echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS)
@echo "cProjectVersionInt = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS)
+ @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS)
@echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
@echo "cHOSTPLATFORM = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS)
@echo "cTARGETPLATFORM = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS)
@echo "cRM = \"$(RM)\"" >> $(CONFIG_HS)
@echo "cCONTEXT_DIFF = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS)
@echo "cHaveLibGmp = \"$(HaveLibGmp)\"" >> $(CONFIG_HS)
- @echo "cGhcWithRegisterised = \"$(GhcWithRegisterised)\"" >> $(CONFIG_HS)
@echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS)
@echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS)
@echo "clibdir = \"$(libdir)\"" >> $(CONFIG_HS)
DIRS = \
utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
- profiling parser usageSP cprAnalysis javaGen ghci
-
+ profiling parser usageSP cprAnalysis javaGen compMan
ifeq ($(GhcWithNativeCodeGen),YES)
DIRS += nativeGen
endif
endif
+# Only include GHCi if we're bootstrapping with at least version 409
+ifeq "$(GhcWithInterpreter)" "YES"
+ghc_409_at_least = $(shell expr "$(GhcMinVersion)" \>= 9)
+ifeq "$(ghc_409_at_least)" "1"
+SRC_HC_OPTS += -DGHCI -optc-DGHCI
+DIRS += ghci
+endif
+endif
HS_SRCS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs))
# driver when booting.
#
ifneq "$(GhcWithHscBuiltViaC)" "YES"
-HC=$(WithGhcHc)
+HC=$(GHC)
else
HC=$(GHC_INPLACE)
endif
ghc_407_at_least = $(shell expr "$(GhcMinVersion)" \>= 7)
ifeq "$(ghc_407_at_least)" "1"
ifneq "$(mingw32_TARGET_OS)" "1"
-SRC_HC_OPTS += -package concurrent -package posix -package text
+SRC_HC_OPTS += -package concurrent -package posix -package text -package util
else
-SRC_HC_OPTS += -package concurrent -package text
+SRC_HC_OPTS += -package concurrent -package text -package util
endif
else
-SRC_HC_OPTS += -syslib concurrent -syslib posix -syslib misc
+SRC_HC_OPTS += -syslib concurrent -syslib posix -syslib misc -syslib util
endif
SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
basicTypes/IdInfo_HC_OPTS = -K2m
codeGen/CgCase_HC_OPTS = -fno-prune-tydecls
hsSyn/HsExpr_HC_OPTS = -K2m
-main/Main_HC_OPTS =
+main/Main_HC_OPTS = -fvia-C
ifneq "$(GhcWithHscBuiltViaC)" "YES"
ifeq "$(GhcReportCompiles)" "YES"
# Avoids Bug in 3.02, it seems
usageSP/UsageSPInf_HC_OPTS = -Onot
-prelude/PrimOp_HC_OPTS = -H12m -K3m
+prelude/PrimOp_HC_OPTS = -H12m -K3m -no-recomp
# because the NCG can't handle the 64-bit math in here
prelude/PrelRules_HC_OPTS = -fvia-C
# separate bugfix to the fixpoint finder.
simplStg/UpdAnal_HC_OPTS = -fno-strictness
-stgSyn/StgInterp_HC_OPTS = -fvia-C
+ghci/StgInterp_HC_OPTS = -fvia-C
# ----------------------------------------------------------------------------
# C compilations
#-----------------------------------------------------------------------------
# Linking
-SRC_LD_OPTS += -no-link-chk -ldl
+SRC_LD_OPTS += -no-link-chk
+# REMOVED SLPJ
+# -ldl
ifneq "$(GhcWithHscBuiltViaC)" "YES"
ifeq "$(GhcReportCompiles)" "YES"
# Extra tidy, remove the .hc files (if you've got them).
MAINTAINER_CLEAN_FILES += $(wildcard */*.hc) \
+ parser/Parser.info rename/ParseIface.info \
parser/Parser.hs rename/ParseIface.hs
-
#-----------------------------------------------------------------------------
# TAGS setup