[project @ 2000-12-20 13:40:08 by simonmar]

on second thoughts, -Rghc-timing should really go in config.mk.in.

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 332b89b..14e105a 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.125 2000/12/20 13:33:00 simonmar Exp $
+# $Id: Makefile,v 1.126 2000/12/20 13:40:08 simonmar Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -120,8 +120,7 @@ endif
 
 HS_OBJS  = \
   $(patsubst %.hc, %.o, $(HCS)) \
-  parser/hschooks.o \
-  parser/hs_ctype.o
+  parser/hschooks.o
 
 DESTDIR       = $(INSTALL_LIBRARY_DIR_GHC)
 
@@ -160,7 +159,7 @@ empty:=
 space:= $(empty) $(empty)
 
 SRC_HC_OPTS += \
-  -cpp -fglasgow-exts -Rghc-timing \
+  -cpp -fglasgow-exts \
   -I. -IcodeGen -InativeGen -Iparser \
   -i$(subst $(space),:,$(DIRS)) 
 

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 2371717..1b9b622 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -159,7 +159,7 @@ GhcCompilerWays=
 #
 #      -dcore-lint     check the types after every pass of the compiler;
 #                      a pretty strong internal check
-GhcHcOpts=-O
+GhcHcOpts=-O -Rghc-timing
 
 # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
 GhcWithHscBuiltViaC=@BootingFromHc@
@@ -214,7 +214,7 @@ endif
 #      -O is pretty desirable, otherwise no inlining of prelude
 #              things (incl "+") happens when compiling with this compiler
 
-GhcLibHcOpts=-O
+GhcLibHcOpts=-O -Rghc-timing
 
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 # Don't split object files for libs if we're building DLLs