[project @ 1997-11-17 13:52:56 by simonm]

[ghc-hetmet.git] / ghc / compiler / Makefile

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 25460e3..800d37b 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -5,7 +5,7 @@ include $(TOP)/mk/boilerplate.mk
 
 #-----------------------------------------------------------------------------
 # Building hsc different ways (default is just `normal' sequential)
-override WAYS=$(GhcCompilerWays)
+WAYS=$(GhcCompilerWays)
 
 #-----------------------------------------------------------------------------
 #              Set SUBDIRS
@@ -44,10 +44,6 @@ DIRS = \
   reader profiling parser
 
 
-ifeq ($(GhcWithDeforester),YES)
-  DIRS += deforest
-endif
-
 ifeq ($(GhcWithNativeCodeGen),YES)
 DIRS += nativeGen
 else
@@ -108,8 +104,7 @@ LIBOBJS = \
 #
 # stuff you get for free in a source distribution
 # 
-SRC_DIST_FILES += rename/ParseIface.hs \
- rename/ParseType.hs rename/ParseUnfolding.hs \
+SRC_DIST_FILES += \
  parser/U_tree.c parser/tree.h parser/tree.c \
  parser/hsparser.tab.c parser/hsparser.tab.h \
  parser/hslexer.c
@@ -145,13 +140,6 @@ else
 SRC_HC_OPTS += -recomp
 endif
 
-ifeq ($(GhcWithDeforester),NO)
- ifeq "$(Ghc2_0)" "NO"
-  SRC_MKDEPENDHS_OPTS += -DOMIT_DEFORESTER
- endif
-SRC_HC_OPTS += -DOMIT_DEFORESTER
-endif
-
 SRC_HC_OPTS += $(GhcHcOpts)
 
 #      Special flags for particular modules
@@ -167,6 +155,7 @@ main/Main_HC_OPTS           = -fvia-C -DPROJECTVERSION=$(GhcProjectVersion)
 main/CmdLineOpts_HC_OPTS       = -fvia-C
 nativeGen/PprMach_HC_OPTS      = -K2m
 nativeGen/MachMisc_HC_OPTS     = -K2m -fvia-C
+nativeGen/MachCode_HC_OPTS     = -H10m
 parser/UgenAll_HC_OPTS                 = -fvia-C '-\#include"hspincl.h"'
 parser/UgenUtil_HC_OPTS        = -fvia-C '-\#include"hspincl.h"'
 parser/U_constr_HC_OPTS        = -fvia-C '-\#include"hspincl.h"'
@@ -178,18 +167,18 @@ parser/U_literal_HC_OPTS  = -fvia-C '-\#include"hspincl.h"'
 parser/U_maybe_HC_OPTS                 = -fvia-C '-\#include"hspincl.h"'
 parser/U_either_HC_OPTS        = -fvia-C '-\#include"hspincl.h"'
 parser/U_qid_HC_OPTS           = -fvia-C '-\#include"hspincl.h"'
-parser/U_tree_HC_OPTS          = -fvia-C '-\#include"hspincl.h"'
+parser/U_tree_HC_OPTS          = -H12m -fvia-C '-\#include"hspincl.h"'
 parser/U_ttype_HC_OPTS                 = -fvia-C '-\#include"hspincl.h"'
-prelude/PrimOp_HC_OPTS                 = -K3m
+prelude/PrimOp_HC_OPTS                 = -H12m -K3m
 reader/Lex_HC_OPTS             = -K2m -H16m -fvia-C
 reader/ReadPrefix_HC_OPTS      = -fvia-C '-\#include"hspincl.h"'
 rename/ParseIface_HC_OPTS      += -Onot -H16m
 rename/ParseType_HC_OPTS       += -Onot -H16m
 rename/ParseUnfolding_HC_OPTS  += -Onot -H30m
 ifeq "$(Ghc2_0)" "YES"
-rename/ParseIface_HC_OPTS       += -fno-warn-incomplete-patterns -fno-warn-overlapped-patterns
-rename/ParseType_HC_OPTS        += -fno-warn-incomplete-patterns -fno-warn-overlapped-patterns
-rename/ParseUnfolding_HC_OPTS   += -fno-warn-incomplete-patterns -fno-warn-overlapped-patterns
+rename/ParseIface_HC_OPTS       += -fno-warn-incomplete-patterns
+rename/ParseType_HC_OPTS        += -fno-warn-incomplete-patterns
+rename/ParseUnfolding_HC_OPTS   += -fno-warn-incomplete-patterns
 endif
 
 ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9"
@@ -209,6 +198,7 @@ rename/RnMonad_HC_OPTS              = -fvia-C
 specialise/Specialise_HC_OPTS  = -Onot -H12m
 stgSyn/StgSyn_HC_OPTS          = -fno-omit-reexported-instances
 typecheck/TcGenDeriv_HC_OPTS   = -H10m
+typecheck/TcHsSyn_HC_OPTS      = -H10m
 typecheck/TcExpr_HC_OPTS       = -H10m
 typecheck/TcEnv_HC_OPTS                = -H10m
 ifeq "$(Ghc2_0)" "NO"
@@ -221,6 +211,11 @@ utils/FastString_HC_OPTS   = -fvia-C -monly-3-regs
 utils/StringBuffer_HC_OPTS     = -fvia-C
 utils/Digraph_HC_OPTS          = -fglasgow-exts -fvia-C
 
+# optimiser misbehaving in 0.29, occurrence analyser fails to terminate when
+# compiling lib/required/Time.lhs
+ifeq "$(Ghc2_0)" "NO"
+simplCore/OccurAnal_HC_OPTS    = -Onot
+endif
 
 # ----------------------------------------------------------------------------
 #              C compilations