# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.127 2000/12/20 15:54:51 rrt Exp $
+# $Id: Makefile,v 1.133 2001/01/16 12:32:45 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 "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS)
@echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
@echo "cHOSTPLATFORM = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS)
@echo "cTARGETPLATFORM = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS)
@echo "cGHC_INCLUDE_DIR = \"$(GHC_INCLUDE_DIR)\"" >> $(CONFIG_HS)
@echo "cGHC_DRIVER_DIR = \"$(GHC_DRIVER_DIR)\"" >> $(CONFIG_HS)
@echo "cGCC = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS)
+ @echo "cMkDLL = \"$(BLD_DLL)\"" >> $(CONFIG_HS)
@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
+ @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
@echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
@echo "cGHC_UNLIT = \"$(GHC_UNLIT)\"" >> $(CONFIG_HS)
@echo "cGHC_MANGLER = \"$(GHC_MANGLER)\"" >> $(CONFIG_HS)
endif
endif
-# Only include GHCi if we're bootstrapping with at least version 409
+ghc_411_at_least = $(shell expr "$(GhcMinVersion)" \>= 11)
+
+# Only include GHCi if we're bootstrapping with at least version 411
ifeq "$(GhcWithInterpreter)" "YES"
-ghc_409_at_least = $(shell expr "$(GhcMinVersion)" \>= 9)
-ifeq "$(ghc_409_at_least)" "1"
+ifeq "$(ghc_411_at_least)" "1"
SRC_HC_OPTS += -DGHCI -optc-DGHCI
DIRS += ghci
endif
space:= $(empty) $(empty)
SRC_HC_OPTS += \
- -cpp -fglasgow-exts \
+ -cpp -fglasgow-exts -Rghc-timing \
-I. -IcodeGen -InativeGen -Iparser \
-i$(subst $(space),:,$(DIRS))
# because the NCG can't handle the 64-bit math in here
prelude/PrelRules_HC_OPTS = -fvia-C
-rename/ParseIface_HC_OPTS += -K2M -Onot -H45m -fno-warn-incomplete-patterns
+rename/ParseIface_HC_OPTS += -Onot -H45m -fno-warn-incomplete-patterns
+
+parser/Parser_HC_OPTS += -Onot -fno-warn-incomplete-patterns
-parser/Parser_HC_OPTS += -K2M -Onot -fno-warn-incomplete-patterns
+# The latest GHC version doesn't have a -K option yet, and it doesn't
+# seem to be necessary anymore for the modules below.
+ifeq "$(ghc_411_at_least)" "0"
+rename/ParseIface_HC_OPTS += -K2m
+parser/Parser_HC_OPTS += -K2m
+endif
ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9"
rename/RnMonad_HC_OPTS = -O2 -O2-for-C