[project @ 2001-01-16 10:49:13 by simonmar]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 32d0b90..5d1868d 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.123 2000/12/20 10:44:17 simonmar Exp $
+# $Id: Makefile,v 1.132 2001/01/16 10:49:13 simonmar Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -39,7 +39,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
        @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)
@@ -50,6 +50,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
        @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 "cLeadingUnderscore    = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
        @echo "cGHC_UNLIT            = \"$(GHC_UNLIT)\"" >> $(CONFIG_HS)
@@ -96,10 +97,11 @@ SRC_HC_OPTS += -DILX
 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
@@ -159,7 +161,7 @@ empty:=
 space:= $(empty) $(empty)
 
 SRC_HC_OPTS += \
-  -cpp -fglasgow-exts \
+  -cpp -fglasgow-exts -Rghc-timing \
   -I. -IcodeGen -InativeGen -Iparser \
   -i$(subst $(space),:,$(DIRS)) 
 
@@ -208,16 +210,21 @@ rename/ParseIface_HC_OPTS         += -Onot -H45m -fno-warn-incomplete-patterns
 
 parser/Parser_HC_OPTS          += -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
 endif
 
-rename/RnEnv_HC_OPTS           = 
 rename/RnSource_HC_OPTS                = -H12m
 rename/RnIfaces_HC_OPTS                = -H8m 
 rename/RnExpr_HC_OPTS          = -H10m
 rename/RnNames_HC_OPTS         = -H12m
-rename/RnMonad_HC_OPTS         = 
 specialise/Specialise_HC_OPTS  = -Onot -H12m
 simplCore/Simplify_HC_OPTS     = -H15m 
 simplCore/OccurAnal_HC_OPTS    = -H10m
@@ -243,21 +250,14 @@ typecheck/TcExpr_HC_OPTS  = -H15m
 typecheck/TcBinds_HC_OPTS       = -H10m
 
 typecheck/TcEnv_HC_OPTS                = -H10m
-utils/SST_HC_OPTS              = 
 utils/StringBuffer_HC_OPTS     = -fvia-C -fno-prune-tydecls
 utils/Digraph_HC_OPTS          = -fglasgow-exts 
-utils/DirUtils_HC_OPTS                 = 
 
 # temporary, due to bug in NCG (x86 spiller fails because a basic block
 # contains both multiply and divide insns, probably soaking up all spill
 # regs) (SDM, 1/6/2000), augmented by JRS 27 Oct 00.
 utils/FastString_HC_OPTS       = -fvia-C
 
-ifeq "$(alpha_HOST_ARCH)" "1"
-# "stbu" bug in alpha native code generator...
-basicTypes/Unique_HC_OPTS      = 
-endif
-
 # flags for PrimPacked:
 #
 # -monly-3-regs