From: panne <unknown>
Date: Thu, 21 Jul 2005 08:41:23 +0000 (+0000)
Subject: [project @ 2005-07-21 08:41:23 by panne]
X-Git-Tag: Initial_conversion_from_CVS_complete~343
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=1f19d1989866ec3c42083e5a4612248842f07814

[project @ 2005-07-21 08:41:23 by panne]
compMan is dead, Jim...
---

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 3dd345e..ba3fee6 100644
--- 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)
@@ -564,7 +564,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
diff --git a/ghc/compiler/package.conf.in b/ghc/compiler/package.conf.in
index f8c3035..57248b8 100644
--- a/ghc/compiler/package.conf.in
+++ b/ghc/compiler/package.conf.in
@@ -281,7 +281,6 @@ import-dirs:   FPTOOLS_TOP_ABS"/ghc/compiler/stage2/utils",
 	       FPTOOLS_TOP_ABS"/ghc/compiler/stage2/profiling",
 	       FPTOOLS_TOP_ABS"/ghc/compiler/stage2/parser",
 	       FPTOOLS_TOP_ABS"/ghc/compiler/stage2/cprAnalysis",
-	       FPTOOLS_TOP_ABS"/ghc/compiler/stage2/compMan",
 	       FPTOOLS_TOP_ABS"/ghc/compiler/stage2/ndpFlatten",
 	       FPTOOLS_TOP_ABS"/ghc/compiler/stage2/iface",
 	       FPTOOLS_TOP_ABS"/ghc/compiler/stage2/cmm",