[project @ 2005-09-14 08:57:46 by simonmar]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 3dd345e..ebc19d1 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -359,7 +359,7 @@ SRC_HC_OPTS += -Istage$(stage)
 ALL_DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
   specialise simplCore stranal stgSyn simplStg codeGen main \
-  profiling parser cprAnalysis compMan ndpFlatten iface cmm
+  profiling parser cprAnalysis ndpFlatten iface cmm
 
 # Make sure we include Config.hs even if it doesn't exist yet...
 ALL_SRCS += $(CONFIG_HS)
@@ -491,7 +491,9 @@ PKG_DEPENDS += unix
 endif
 endif
 
-ifneq "$(findstring YES, $(bootstrapped) $(ghc_ge_603))" ""
+# We use the Cabal package in stages 2/3 only; in stage 1 we're using
+# the libcompat library which provides the Cabal modules.
+ifneq "$(stage)" "1"
 SRC_HC_OPTS += -package Cabal
 PKG_DEPENDS += Cabal
 endif
@@ -519,13 +521,20 @@ endif
 # It's an expensive module to recompile!
 prelude/PrimOp_HC_OPTS                 = -H80m
 
-# because the NCG can't handle the 64-bit math in here
-prelude/PrelRules_HC_OPTS      = -fvia-C
 
 main/ParsePkgConf_HC_OPTS      += -fno-warn-incomplete-patterns
+parser/Parser_HC_OPTS          += -fno-warn-incomplete-patterns
+
+ifeq "$(ghc_ge_603)" "NO"
 # Use -fvia-C since the NCG can't handle the narrow16Int# (and intToInt16#?)
 # primops on all platforms.
-parser/Parser_HC_OPTS          += -fno-warn-incomplete-patterns -fvia-C
+parser/Parser_HC_OPTS          += -fvia-C
+# because the NCG can't handle the 64-bit math in here
+prelude/PrelRules_HC_OPTS      += -fvia-C
+# ByteCodeItbls uses primops that the NCG doesn't support.
+ghci/ByteCodeItbls_HC_OPTS     += -fvia-C
+ghci/ByteCodeLink_HC_OPTS      += -fvia-C -monly-3-regs
+endif
 
 # Careful optimisation of the parser: we don't want to throw everything
 # at it, because that takes too long and doesn't buy much, but we do want
@@ -545,10 +554,6 @@ ifeq "$(bootstrapped)" "YES"
 utils/Binary_HC_OPTS           = -funbox-strict-fields
 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
-
 # BinIface and Binary take ages to both compile and run if you don's use -O
 main/BinIface_HC_OPTS          += -O
 utils/Binary_HC_OPTS           += -O
@@ -564,7 +569,6 @@ utils/FastMutInt_HC_OPTS    += -O
 # DriverMkDepend), causing some of them to be commoned up.  We have a fix for
 # this in 5.00+, but earlier versions of the compiler will need CSE turned off.
 # To be on the safe side, we disable CSE in *all* modules with top-level IORefs.
-compMan/CompManager_HC_OPTS    = -fno-cse
 ghci/InteractiveUI_HC_OPTS     = -fno-cse
 main/CmdLineOpts_HC_OPTS       = -fno-cse
 main/DriverMkDepend_HC_OPTS    = -fno-cse
@@ -804,8 +808,13 @@ depend :: $(STAGE_PLATFORM_H) $(HS_SRCS) $(C_SRCS)
 ifneq "$(BootingFromHc)" "YES"
        $(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS)
 endif
+       $(SED) -i -e 's:^.*/lib/compat.*$$::' .depend-BASE
        $(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS) 
        $(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g' <.depend-BASE >.depend-$(stage)
 # The binmode stuff tells perl not to add stupid ^M's to the output
 
+# The $(SED) command above is a workaround for a bug in the 
+# -optdep--exclude-module flag in GHC 6.4.  It is not required for any
+# other version of GHC, but doesn't do any harm.
+
 -include .depend-$(stage)