diff options
| author | simonmar <unknown> | 2002-11-15 11:20:31 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2002-11-15 11:20:31 +0000 |
| commit | 805fcaad8d2efd98c733f684d3d24a9ba387708f (patch) | |
| tree | 3da84732e2eea57c0ab82bafebb333466f3cb66f /mk | |
| parent | 3f06193b368bb7c66a569a5194f9f5716c76ebd6 (diff) | |
| download | haskell-805fcaad8d2efd98c733f684d3d24a9ba387708f.tar.gz | |
[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.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk.sample | 8 | ||||
| -rw-r--r-- | mk/config.mk.in | 15 | ||||
| -rw-r--r-- | mk/target.mk | 3 |
3 files changed, 6 insertions, 20 deletions
diff --git a/mk/build.mk.sample b/mk/build.mk.sample index 3f55836d0d..8205f02291 100644 --- 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 e693b2dd32..db75471a1c 100644 --- 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 252d331f18..2843334475 100644 --- 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 #---------------------------------------- |