projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2000-12-30 20:35:37 by panne]
[ghc-hetmet.git]
/
ghc
/
compiler
/
Makefile
diff --git
a/ghc/compiler/Makefile
b/ghc/compiler/Makefile
index
e40bd81
..
aa5c001
100644
(file)
--- a/
ghc/compiler/Makefile
+++ b/
ghc/compiler/Makefile
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.124 2000/12/20 10:46:12 simonmar Exp $
+# $Id: Makefile,v 1.128 2000/12/30 20:35:37 panne Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
TOP = ..
include $(TOP)/mk/boilerplate.mk
@@
-96,10
+96,10
@@
SRC_HC_OPTS += -DILX
endif
endif
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"
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
SRC_HC_OPTS += -DGHCI -optc-DGHCI
DIRS += ghci
endif
@@
-208,6
+208,13
@@
rename/ParseIface_HC_OPTS += -Onot -H45m -fno-warn-incomplete-patterns
parser/Parser_HC_OPTS += -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
endif
ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9"
rename/RnMonad_HC_OPTS = -O2 -O2-for-C
endif