projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-08-04 06:19:54 by ken]
[ghc-hetmet.git]
/
ghc
/
compiler
/
Makefile
diff --git
a/ghc/compiler/Makefile
b/ghc/compiler/Makefile
index
4edc80b
..
054a97a
100644
(file)
--- a/
ghc/compiler/Makefile
+++ b/
ghc/compiler/Makefile
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.170 2001/07/05 13:31:09 sewardj Exp $
+# $Id: Makefile,v 1.181 2001/08/04 06:19:54 ken Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
TOP = ..
include $(TOP)/mk/boilerplate.mk
@@
-108,14
+108,16
@@
CANON_HC_VERSION=$(shell echo "$(GhcVersion)" | sed -e 's/\.//g;s/^\(...\)......
ifeq "$(BootingFromHc)" "YES"
# HC files are always from a self-booted compiler
ifeq "$(BootingFromHc)" "YES"
# HC files are always from a self-booted compiler
-ghc_411_at_least = YES
+bootstrapped = YES
+compiling_with_4xx=NO
else
else
-ghc_411_at_least=$(shell if (test $(CANON_HC_VERSION) -ge 4110); then echo YES; else echo NO; fi)
+bootstrapped = $(shell if (test $(CANON_HC_VERSION) -ge $(ProjectVersionInt)0); then echo YES; else echo NO; fi)
+compiling_with_4xx = $(shell if (test $(CANON_HC_VERSION) -lt 5000); then echo YES; else echo NO; fi)
endif
# Only include GHCi if we're bootstrapping with at least version 411
ifeq "$(GhcWithInterpreter)" "YES"
endif
# Only include GHCi if we're bootstrapping with at least version 411
ifeq "$(GhcWithInterpreter)" "YES"
-ifeq "$(ghc_411_at_least)" "YES"
+ifeq "$(bootstrapped)" "YES"
SRC_HC_OPTS += -DGHCI
DIRS += ghci
endif
SRC_HC_OPTS += -DGHCI
DIRS += ghci
endif
@@
-178,7
+180,7
@@
DESTDIR = $(INSTALL_LIBRARY_DIR_GHC)
# Big Fudge to get around inherent problem that Makefile setup
# has got with 'mkdependC'.
#
# Big Fudge to get around inherent problem that Makefile setup
# has got with 'mkdependC'.
#
-SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDES)
+SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDE_DIR)
# -----------------------------------------------------------------------------
# Haskell compilations
# -----------------------------------------------------------------------------
# Haskell compilations
@@
-227,7
+229,11
@@
endif
SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
SRC_HC_OPTS += -recomp $(GhcHcOpts)
SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
SRC_HC_OPTS += -recomp $(GhcHcOpts)
-SRC_HC_OPTS += -H16m
+# TODO: change back to 16M when the strictness analyser is working again.
+SRC_HC_OPTS += -H80M
+# TODO: remove when the strictness analyser is working again.
+rename/ParseIface_HC_OPTS += -H120M
+parser/Parser_HC_OPTS += -H100M
# Special flags for particular modules
# The standard suffix rule for compiling a Haskell file
# Special flags for particular modules
# The standard suffix rule for compiling a Haskell file
@@
-247,7
+253,7
@@
main/ParsePkgConf_HC_OPTS += -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.
# 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)" "NO"
+ifeq "$(compiling_with_4xx)" "YES"
rename/ParseIface_HC_OPTS += -K2m
parser/Parser_HC_OPTS += -K2m
endif
rename/ParseIface_HC_OPTS += -K2m
parser/Parser_HC_OPTS += -K2m
endif
@@
-303,6
+309,8
@@
SRC_C_OPTS += -O -I. -IcodeGen
# Generate supporting stuff for prelude/PrimOp.lhs
# from prelude/primops.txt
# Generate supporting stuff for prelude/PrimOp.lhs
# from prelude/primops.txt
+CLEAN_FILES += prelude/primops.txt
+
GENPOC=$(TOP)/utils/genprimopcode/genprimopcode
PRIMOP_BITS=primop-data-decl.hs-incl \
GENPOC=$(TOP)/utils/genprimopcode/genprimopcode
PRIMOP_BITS=primop-data-decl.hs-incl \
@@
-372,7
+380,7
@@
ghc-inplace : $(HS_PROG)
chmod 755 $@
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
@$(RM) $@.bat
chmod 755 $@
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
@$(RM) $@.bat
- echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS) %*" >$@.bat
+ echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS) %1 %2 %3 %4 %5 %6 %7 %8 %9" >$@.bat
chmod 755 $@.bat
endif
chmod 755 $@.bat
endif