X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=ccb63f66da109816ec679109643c648587de3bd4;hb=3b4e398466c0a8b037e112d40bb20b77a9b42bf0;hp=9f11efcd38e76b7f9ce2840ab79e2ef9a37fd8a3;hpb=6c9a37e31afc41d57417a3828877577d8d270266;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 9f11efc..ccb63f6 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,26 +36,26 @@ HSLIB = std
 # we don't want PrelMain in the GHCi library.
 GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
 
-HS_SRCS += $(patsubst %.hsc,%.hs,$(wildcard *.hsc))
+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))
 
 #-----------------------------------------------------------------------------
 # 	Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fvia-C -fglasgow-exts $(GhcLibHcOpts) $(PACKAGE)
-ifneq "$(DLLized)" "YES"
-SRC_HC_OPTS += -static
-endif
+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
+PrelInt_HC_OPTS      = -monly-3-regs
+PrelWord_HC_OPTS     = -monly-3-regs
 
 #-----------------------------------------------------------------------------
 # 	Dependency generation
@@ -74,35 +73,28 @@ 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))
-endif
-
+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
-ifeq "$(DLLized)" "YES"
 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)
 
-#
-# If we're building the unregisterised way, it may well be for Hugs.
-# In that case, remember to bind the cbits objects into a single file
-# which hugs can load as an auxiliary object file when loading the Prelude.
-#
-ifeq "$(way)" "u"
-all :: libHSstd_cbits.u_o
-CLEAN_FILES += libHSstd_cbits.u_o
-libHSstd_cbits.u_o:
-	$(RM) libHSstd_cbits.u_o
-	ld -r -o libHSstd_cbits.u_o cbits/*.o
-endif
+CLEAN_FILES +=  \
+	$(patsubst %.hsc, %.hs,    $(HSC_SRCS)) \
+	$(patsubst %.hsc, %_hsc.c, $(HSC_SRCS)) \
+	$(patsubst %.hsc, %_hsc.h, $(HSC_SRCS))
 
 #-----------------------------------------------------------------------------
 # 	Installation; need to install .hi files as well as libraries
@@ -123,8 +115,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