X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=4a7b2c25e3a522b7112ea456b0378fb9cd99291a;hb=50027272414438955dbc41696541cbd25da55883;hp=69e1f18638479413416410d459ced9908b7f3eed;hpb=4d0f108451cc199b55dfa44c40790be6196a39e2;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 69e1f18..4a7b2c2 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -22,8 +22,7 @@ endif
 # 	Setting the standard variables
 #
 
-HC 	 = $(GHC_INPLACE)
-CC	 = $(GHC_INPLACE)
+HC = $(GHC_INPLACE)
 
 ifneq "$(DLLized)" "YES"
 PACKAGE = -package-name std
@@ -37,6 +36,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))
@@ -44,19 +45,15 @@ HS_SRCS := $(HSC_HS) $(filter-out $(HSC_HS),$(HS_SRCS))
 #-----------------------------------------------------------------------------
 # 	Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fvia-C -fglasgow-exts $(GhcLibHcOpts) $(PACKAGE)
+SRC_HC_OPTS += -cpp -fvia-C -fglasgow-exts $(GhcLibHcOpts) $(PACKAGE)
 
 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
@@ -74,19 +71,23 @@ PrelPrimopWrappers.hs: ../../compiler/prelude/primops.txt
 PrelGHC.$(way_)hi	: PrelGHC.hi-boot
 	cp $< $@
 
-boot :: PrelPrimopWrappers.hs PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
-all :: PrelPrimopWrappers.hs
+boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+
+ifneq "$(BootingFromHc)" "YES"
+boot :: PrelPrimopWrappers.hs
+all  :: PrelPrimopWrappers.hs
+endif
 
 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 +113,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