diff options
| author | panne <unknown> | 2000-12-30 20:35:37 +0000 |
|---|---|---|
| committer | panne <unknown> | 2000-12-30 20:35:37 +0000 |
| commit | 4257efe4c07ab9e674e621a9177f7f41cc72c152 (patch) | |
| tree | b04e5e14fec1d7d11a3a93552ac2b3656e0685a7 /ghc/compiler/Makefile | |
| parent | 2a4197e53fc0dde1b2942963fd89b7358bdd98a1 (diff) | |
| download | haskell-4257efe4c07ab9e674e621a9177f7f41cc72c152.tar.gz | |
[project @ 2000-12-30 20:35:37 by panne]
- Only build interpreter with version >= 4.11, not 4.09. The latter
doesn't work because of some BCO# trouble. This shouldn't make a
real difference to (sane) compiler people, who always do at least
a two-stage bootstrap.
- Nuke some -K2m options when building with GHC >= 4.11, because it's
not understood (yet) and doesn't seem to be necessary anymore.
Diffstat (limited to 'ghc/compiler/Makefile')
| -rw-r--r-- | ghc/compiler/Makefile | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index af977aa775..aa5c001eeb 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.127 2000/12/20 15:54:51 rrt Exp $ +# $Id: Makefile,v 1.128 2000/12/30 20:35:37 panne Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -96,10 +96,10 @@ SRC_HC_OPTS += -DILX endif endif -# Only include GHCi if we're bootstrapping with at least version 409 +# Only include GHCi if we're bootstrapping with at least version 411 ifeq "$(GhcWithInterpreter)" "YES" -ghc_409_at_least = $(shell expr "$(GhcMinVersion)" \>= 9) -ifeq "$(ghc_409_at_least)" "1" +ghc_411_at_least = $(shell expr "$(GhcMinVersion)" \>= 11) +ifeq "$(ghc_411_at_least)" "1" SRC_HC_OPTS += -DGHCI -optc-DGHCI DIRS += ghci endif @@ -204,9 +204,16 @@ prelude/PrimOp_HC_OPTS = -H12m -no-recomp # because the NCG can't handle the 64-bit math in here prelude/PrelRules_HC_OPTS = -fvia-C -rename/ParseIface_HC_OPTS += -K2M -Onot -H45m -fno-warn-incomplete-patterns +rename/ParseIface_HC_OPTS += -Onot -H45m -fno-warn-incomplete-patterns -parser/Parser_HC_OPTS += -K2M -Onot -fno-warn-incomplete-patterns +parser/Parser_HC_OPTS += -Onot -fno-warn-incomplete-patterns + +# The latest GHC version doesn't have a -K option yet, and it doesn't +# seem to be necessary anymore for the modules below. +ifeq "$(ghc_411_at_least)" "0" +rename/ParseIface_HC_OPTS += -K2m +parser/Parser_HC_OPTS += -K2m +endif ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9" rename/RnMonad_HC_OPTS = -O2 -O2-for-C |