[project @ 2001-01-09 17:43:57 by rrt]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index af977aa..d7ac0a0 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.127 2000/12/20 15:54:51 rrt Exp $
+# $Id: Makefile,v 1.131 2001/01/09 17:43:57 rrt 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
@@ -204,9 +206,16 @@ prelude/PrimOp_HC_OPTS             = -H12m -no-recomp
 # 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