[project @ 2002-11-15 11:20:30 by simonmar]

- get rid of $(FptoolsHcOpts), it was ill-conceived.  As it was,
  $(FptoolsHcOpts) was overriding options in $(GhcHcOpts).  Now,
  we just use $(SRC_HC_OPTS) instead, which can be overriden
  by $(GhcHcOpts).

- Don't bother adding -ldl to $(SRC_HC_OPTS) in config.mk.  It is
  added to the RTS's package configuration if necessary.

diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index 3f55836..8205f02 100644 (file)
--- a/mk/build.mk.sample
+++ b/mk/build.mk.sample
@@ -23,9 +23,9 @@ ifeq "$(BuildFlavour)" "devel"
 
 GhcCompilerWays =
 
-FptoolsHcOpts = -H32m $(MyWarningOpts)
+SRC_HC_OPTS   = -H32m -O0 $(MyWarningOpts)
 GhcHcOpts     = -Rghc-timing -DDEBUG
-GhcLibHcOpts  = -dcore-lint -O -H32m  $(MyWarningOpts) -keep-hc-files 
+GhcLibHcOpts  = -dcore-lint $(MyWarningOpts) -keep-hc-files 
 GhcLibWays    =
 
 # Debugging RTS
@@ -54,9 +54,9 @@ endif
 
 ifeq "$(BuildFlavour)" "perf"
 
-FptoolsHcOpts = -H32m -O $(MyWarningOpts)
+SRC_HC_OPTS   = -H32m -O $(MyWarningOpts)
 GhcHcOpts     = -Rghc-timing
-GhcLibHcOpts  = -H32m -O $(MyWarningOpts)
+GhcLibHcOpts  =
 
 GhcLibWays    = p
 

diff --git a/mk/config.mk.in b/mk/config.mk.in
index e693b2d..db75471 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -164,16 +164,6 @@ GhcCompilerWays=
 #                      used to compile GHC.  Useful when bootstrapping.
 GhcHcOpts=-Rghc-timing
 
-# Extra Haskell compiler options to use when compiling all Haskell
-# *programs* (not libraries), including GHC itself.
-# Typical options to use here:
-#
-#      -H25m           use a bigger heap (to speed up compilation)
-#
-#      -O              compile an optimised compiler
-#
-FptoolsHcOpts=-O
-
 # Build a compiler that will build *unregisterised* libraries and
 # binaries by default.  Unregisterised code is supposed to compile and
 # run without any support for architecture-specific assembly mangling,
@@ -214,9 +204,6 @@ HaveRtldLocal = @HaveRtldLocal@
 
 ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd netbsd openbsd)" ""
 GhcWithInterpreter=YES
-ifeq "$(HaveLibDL)" "YES"
-SRC_HC_OPTS += -ldl
-endif
 else 
 GhcWithInterpreter=NO
 endif
@@ -551,6 +538,8 @@ endif
 #
 #      SRC_HC_OPTS += -O
 
+SRC_HC_OPTS += -H16m -O
+
 # These flags make flex 8-bit
 SRC_FLEX_OPTS  += -8
 

diff --git a/mk/target.mk b/mk/target.mk
index 252d331..2843334 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -243,9 +243,6 @@ else
 $(HS_PROG) :: $(HS_OBJS)
        $(CC) -o $@ $(HC_BOOT_CC_OPTS) $(HC_BOOT_LD_OPTS) $(HS_OBJS) $(HC_BOOT_LIBS)
 endif
-
-# for building a Haskell program, we add FptoolsHcOpts
-SRC_HC_OPTS += $(FptoolsHcOpts)
 endif
 
 #----------------------------------------