X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=054a97a30992b84e70cee5f11ca98f32af2feae7;hb=ea138284b7343bb1810cfbd0284a608dc57f7d46;hp=60d6ffe7f65ccb0f4fc0233408dec7ed2c58a86a;hpb=5585265309f9473f7df2fd6a778c28eff6cd9587;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 60d6ffe..054a97a 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.174 2001/07/10 14:25:24 rrt Exp $ +# $Id: Makefile,v 1.181 2001/08/04 06:19:54 ken Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -180,7 +180,7 @@ DESTDIR = $(INSTALL_LIBRARY_DIR_GHC) # 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 @@ -224,12 +224,16 @@ SRC_HC_OPTS += \ ifneq "$(mingw32_TARGET_OS)" "1" SRC_HC_OPTS += -package concurrent -package posix -package text -package util else -SRC_HC_OPTS += -package concurrent -package win32 -package text -package util +SRC_HC_OPTS += -package concurrent -package text -package util endif 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 @@ -305,6 +309,8 @@ SRC_C_OPTS += -O -I. -IcodeGen # 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 \ @@ -374,7 +380,7 @@ ghc-inplace : $(HS_PROG) 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