Commit 805fcaad authored by simonmar's avatar simonmar

[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.
parent 3f06193b
...@@ -23,9 +23,9 @@ ifeq "$(BuildFlavour)" "devel" ...@@ -23,9 +23,9 @@ ifeq "$(BuildFlavour)" "devel"
GhcCompilerWays = GhcCompilerWays =
FptoolsHcOpts = -H32m $(MyWarningOpts) SRC_HC_OPTS = -H32m -O0 $(MyWarningOpts)
GhcHcOpts = -Rghc-timing -DDEBUG GhcHcOpts = -Rghc-timing -DDEBUG
GhcLibHcOpts = -dcore-lint -O -H32m $(MyWarningOpts) -keep-hc-files GhcLibHcOpts = -dcore-lint $(MyWarningOpts) -keep-hc-files
GhcLibWays = GhcLibWays =
# Debugging RTS # Debugging RTS
...@@ -54,9 +54,9 @@ endif ...@@ -54,9 +54,9 @@ endif
ifeq "$(BuildFlavour)" "perf" ifeq "$(BuildFlavour)" "perf"
FptoolsHcOpts = -H32m -O $(MyWarningOpts) SRC_HC_OPTS = -H32m -O $(MyWarningOpts)
GhcHcOpts = -Rghc-timing GhcHcOpts = -Rghc-timing
GhcLibHcOpts = -H32m -O $(MyWarningOpts) GhcLibHcOpts =
GhcLibWays = p GhcLibWays = p
......
...@@ -164,16 +164,6 @@ GhcCompilerWays= ...@@ -164,16 +164,6 @@ GhcCompilerWays=
# used to compile GHC. Useful when bootstrapping. # used to compile GHC. Useful when bootstrapping.
GhcHcOpts=-Rghc-timing 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 # Build a compiler that will build *unregisterised* libraries and
# binaries by default. Unregisterised code is supposed to compile and # binaries by default. Unregisterised code is supposed to compile and
# run without any support for architecture-specific assembly mangling, # run without any support for architecture-specific assembly mangling,
...@@ -214,9 +204,6 @@ HaveRtldLocal = @HaveRtldLocal@ ...@@ -214,9 +204,6 @@ HaveRtldLocal = @HaveRtldLocal@
ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd netbsd openbsd)" "" ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd netbsd openbsd)" ""
GhcWithInterpreter=YES GhcWithInterpreter=YES
ifeq "$(HaveLibDL)" "YES"
SRC_HC_OPTS += -ldl
endif
else else
GhcWithInterpreter=NO GhcWithInterpreter=NO
endif endif
...@@ -551,6 +538,8 @@ endif ...@@ -551,6 +538,8 @@ endif
# #
# SRC_HC_OPTS += -O # SRC_HC_OPTS += -O
SRC_HC_OPTS += -H16m -O
# These flags make flex 8-bit # These flags make flex 8-bit
SRC_FLEX_OPTS += -8 SRC_FLEX_OPTS += -8
......
...@@ -243,9 +243,6 @@ else ...@@ -243,9 +243,6 @@ else
$(HS_PROG) :: $(HS_OBJS) $(HS_PROG) :: $(HS_OBJS)
$(CC) -o $@ $(HC_BOOT_CC_OPTS) $(HC_BOOT_LD_OPTS) $(HS_OBJS) $(HC_BOOT_LIBS) $(CC) -o $@ $(HC_BOOT_CC_OPTS) $(HC_BOOT_LD_OPTS) $(HS_OBJS) $(HC_BOOT_LIBS)
endif endif
# for building a Haskell program, we add FptoolsHcOpts
SRC_HC_OPTS += $(FptoolsHcOpts)
endif endif
#---------------------------------------- #----------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment