[project @ 2005-01-26 15:04:08 by simonmar]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 407ad66..0a2805a 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -190,7 +190,6 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
        @echo "cProjectPatchLevel    = \"$(ProjectPatchLevel)\"" >> $(CONFIG_HS)
        @echo "cBooterVersion        = \"$(GhcVersion)\"" >> $(CONFIG_HS)
        @echo "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
-       @echo "cHOSTPLATFORM         = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS)
        @echo "cTARGETPLATFORM       = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS)
        @echo "cTARGETOS             = \"$(TargetOS_CPP)\"" >> $(CONFIG_HS)
        @echo "cTARGETARCH           = \"$(TargetArch_CPP)\"" >> $(CONFIG_HS)
@@ -262,14 +261,11 @@ endif
 ifeq "$(BootingFromHc)" "YES"
 # HC files are always from a self-booted compiler
 bootstrapped = YES
-compiling_with_4xx=NO
 else
 ifneq "$(findstring $(stage), 2 3)" ""
 bootstrapped = YES
-compiling_with_4xx = NO
 else
 bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt) -a $(GhcPatchLevel) -ge $(ProjectPatchLevel)); then echo YES; else echo NO; fi)
-compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES; else echo NO; fi)
 endif
 endif
 
@@ -283,7 +279,7 @@ endif
 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
@@ -317,6 +313,10 @@ EXCLUDED_SRCS += deSugar/DsMeta.hs typecheck/TcSplice.lhs hsSyn/Convert.lhs
 
 endif # bootstrapped with interpreter
 
+ifeq "$(bootstrapped)" "YES"
+SRC_HC_OPTS += -package Cabal
+endif
+
 # -----------------------------------------------
 # mkdependC stuff
 #
@@ -403,11 +403,6 @@ ifeq "$(bootstrapped)" "YES"
 utils/Binary_HC_OPTS           = -funbox-strict-fields
 endif
 
-# 4.08.2's NCG can't cope with Binary
-ifeq "$(compiling_with_4xx)" "YES"
-utils/Binary_HC_OPTS           += -fvia-C
-endif
-
 # ByteCodeItbls uses primops that the NCG doesn't support yet.
 ghci/ByteCodeItbls_HC_OPTS     += -fvia-C
 ghci/ByteCodeLink_HC_OPTS      += -fvia-C -monly-3-regs
@@ -523,16 +518,16 @@ endif
 SRC_MKDEPENDHS_OPTS += \
        -optdep--exclude-module=Compat.RawSystem \
        -optdep--exclude-module=Compat.Directory \
-       -optdep--exclude-module=Distribution.Compat.Error \
        -optdep--exclude-module=Distribution.Compat.ReadP \
        -optdep--exclude-module=Distribution.Extension \
+       -optdep--exclude-module=Distribution.GetOpt \
        -optdep--exclude-module=Distribution.InstalledPackageInfo \
        -optdep--exclude-module=Distribution.License \
        -optdep--exclude-module=Distribution.Package \
        -optdep--exclude-module=Distribution.ParseUtils \
        -optdep--exclude-module=Distribution.Setup \
        -optdep--exclude-module=Distribution.Version \
-       -optdep--exclude-module=System.FilePath
+       -optdep--exclude-module=System.Directory.Internals
 endif
 
 SRC_LD_OPTS += -no-link-chk