[project @ 2001-04-13 13:37:24 by panne]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 13a5bf3..7f23b5f 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.151 2001/04/03 12:55:01 rrt Exp $
+# $Id: Makefile,v 1.154 2001/04/13 13:37:24 panne Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -96,7 +96,7 @@ ifeq "$(BootingFromHc)" "YES"
 # HC files are always from a self-booted compiler
 ghc_411_at_least = 1
 else
-ghc_411_at_least = $(shell expr "$(GhcMinVersion)" \>= 11)
+ghc_411_at_least = $(shell expr "$(GhcVersion)" \>= 4.11)
 endif
 
 # Only include GHCi if we're bootstrapping with at least version 411
@@ -218,11 +218,22 @@ utils/PrimPacked_HC_OPTS  = -fvia-C -monly-3-regs
 
 # ByteCodeItbls uses primops that the NCG doesn't support yet.
 ghci/ByteCodeItbls_HC_OPTS     = -fvia-C
-
-# CSE interacts badly with the top-level IORefs in DriverState, 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 on this module.
+ghci/ByteCodeLink_HC_OPTS      = -fvia-C
+
+# CSE interacts badly with top-level IORefs (reportedly in DriverState and
+# 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/DriverFlags_HC_OPTS       = -fno-cse
+main/DriverMkDepend_HC_OPTS    = -fno-cse
+main/DriverPipeline_HC_OPTS    = -fno-cse
 main/DriverState_HC_OPTS       = -fno-cse
+main/DriverUtil_HC_OPTS                = -fno-cse
+main/Finder_HC_OPTS            = -fno-cse
+main/TmpFiles_HC_OPTS          = -fno-cse
 
 # ----------------------------------------------------------------------------
 #              C compilations