X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=0857f53dd3b13edf84c094ed1021f2cd33cab521;hb=874d309255f603878dc31144c59a28d9dbca000f;hp=1fa0ab39eac003abf0cf7c25960c84bdcdf8d4fe;hpb=30821abaf07b1b761bf8889a65463e5fea798619;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 1fa0ab3..0857f53 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -37,6 +37,8 @@ HSLIB = std
 # we don't want PrelMain in the GHCi library.
 GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
 
+BOOT_SRCS += PrelPrimopWrappers.hs
+
 HSC_SRCS = $(wildcard *.hsc)
 HSC_HS   = $(patsubst %.hsc,%.hs, $(HSC_SRCS))
 HS_SRCS := $(HSC_HS) $(filter-out $(HSC_HS),$(HS_SRCS))
@@ -50,13 +52,9 @@ ifdef USE_REPORT_PRELUDE
 SRC_HC_OPTS += -DUSE_REPORT_PRELUDE=1
 endif
 
-# Object and interface files have suffixes tagged with their ways
-ifneq "$(way)" ""
-SRC_HC_OPTS += -hisuf $(way_)hi
-endif
-
 # Special options
 PrelStorable_HC_OPTS = -monly-3-regs
+PrelCError_HC_OPTS = +RTS -K4m -RTS
 
 #-----------------------------------------------------------------------------
 # 	Dependency generation
@@ -80,13 +78,13 @@ all :: PrelPrimopWrappers.hs
 DLL_DESCRIPTION="GHC-compiled Haskell Prelude"
 
 ifeq "$(DLLized)" "YES"
-HS_SRCS := $(filter-out PrelMain.lhs PrelHugs.lhs, $(HS_SRCS))
+HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS))
 # PrelMain.dll_o isn't to be included in the final .a, 
 # but it needs to be generated
 all :: PrelMain.dll_o
 endif
 
-CLEAN_FILES += PrelPrimopWrappers.hs PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
 CLEAN_FILES +=  \
 	$(patsubst %.hsc, %.hs, $(HSC_SRCS)) \
@@ -112,8 +110,5 @@ INSTALL_LIBS  += PrelMain.dll_o
 endif
 
 INSTALL_DATAS += PrelGHC.$(way_)hi
-ifeq "$(DLLized)" "YES"
-INSTALL_DATAS := $(filter-out PrelHugs.$(way_)hi,$(INSTALL_DATAS))
-endif
 
 include $(TOP)/mk/target.mk