[project @ 1997-09-05 09:16:19 by simonm]

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

diff --git a/ghc/lib/Makefile b/ghc/lib/Makefile
index ea0a08c..62e5c3b 100644 (file)
--- a/ghc/lib/Makefile
+++ b/ghc/lib/Makefile
@@ -10,6 +10,8 @@
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
+WAYS=$(GhcLibWays)
+
 ifeq "$(way)" ""
 SUBDIRS = cbits
 ifeq ($(IncludeTestDirsInBuild),YES)
@@ -38,8 +40,8 @@ SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts)
 
 #
 # Profiling options
-WAY_p_HC_OPTS += -prof -GPrelude
-WAY_mr_HC_OPTS += -prof -GPrelude
+WAY_p_HC_OPTS += -GPrelude
+WAY_mr_HC_OPTS += -GPrelude
 
 #
 # Object and interface files have suffixes tagged with their ways
@@ -49,11 +51,11 @@ SRC_HC_OPTS += -hisuf $(way_)hi
 endif
 
 # per-module flags
-
+ghc/ArrBase_HC_OPTS         += -monly-2-regs
 glaExts/PackedString_HC_OPTS += -monly-3-regs
 required/Directory_HC_OPTS   += -monly-3-regs 
 concurrent/Parallel_HC_OPTS  += -fglasgow-exts
-required/Time_HC_OPTS        += -monly-3-regs -H10m
+required/Time_HC_OPTS        += -monly-3-regs -H12m
 
 # Far too much heap is needed to compile PrelNum with -O at the
 # moment, but there you go..
@@ -77,10 +79,10 @@ SRC_MKDEPENDHS_OPTS += -ighc:required:glaExts:concurrent -I$(GHC_INCLUDE_DIR)
 #-----------------------------------------------------------------------------
 #      Rules
 
-GHC.$(way_)hi  : GHC.hi-boot
-       cp GHC.hi-boot GHC.$(way_)hi
-
+ghc/GHC.$(way_)hi      : ghc/GHC.hi-boot
+       cp $< $@
 
+boot :: ghc/GHC.hi $(foreach way, $(WAYS), ghc/GHC.$(way)_hi)
 
 #-----------------------------------------------------------------------------
 #      Installation; need to install .hi files as well as libraries
@@ -106,5 +108,3 @@ INSTALL_LIBS  += $(LIBRARY)
 INSTALL_DATAS += $(HS_IFACES)
 
 include $(TOP)/mk/target.mk
-
-