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

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 81feb53..0857f53 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -22,49 +22,39 @@ endif
 # 	Setting the standard variables
 #
 
-LIBRARY = libHS$(_way).a
-HS_SRCS = $(wildcard *.lhs)
-HS_OBJS = $(HS_SRCS:.lhs=.$(way_)o)
-LIBOBJS = $(HS_OBJS)
-HS_IFACES= $(HS_SRCS:.lhs=.$(way_)hi) PrelGHC.$(way_)hi
+HC 	 = $(GHC_INPLACE)
+CC	 = $(GHC_INPLACE)
 
+ifneq "$(DLLized)" "YES"
+PACKAGE = -package-name std
+else
+# Hack by SPJ to delay if-then-else until the pattern rule when we have $*
+PACKAGE = $(subst ~, ,$(word $(words dummy $(findstring $(notdir $*), PrelMain )), -package-name~std))
+endif
+
+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))
 
 #-----------------------------------------------------------------------------
 # 	Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts)
-
-#
-# Profiling options
-WAY_p_HC_OPTS += -GPrelude
-WAY_mr_HC_OPTS += -GPrelude
+SRC_HC_OPTS += -cpp -fvia-C -fglasgow-exts $(GhcLibHcOpts) $(PACKAGE)
 
-#
-# Object and interface files have suffixes tagged with their ways
-#
-ifneq "$(way)" ""
-SRC_HC_OPTS += -hisuf $(way_)hi
+ifdef USE_REPORT_PRELUDE
+SRC_HC_OPTS += -DUSE_REPORT_PRELUDE=1
 endif
 
-# per-module flags
-PrelArrExtra_HC_OPTS     += -monly-2-regs
-Directory_HC_OPTS   	 += -monly-3-regs 
-Time_HC_OPTS        	 += -monly-3-regs
-
-# Far too much heap is needed to compile PrelNumExtra with -O at the
-# moment, but there you go..
-PrelNumExtra_HC_OPTS     += -H30m -K2m
-
-PrelBase_HC_OPTS         += -H10m
-PrelRead_HC_OPTS         += -H16m
-PrelTup_HC_OPTS          += -H12m
-PrelNum_HC_OPTS		 += -H12m -K3m
-PrelArr_HC_OPTS          += -H8m
-PrelHandle_HC_OPTS       += -H14m
-Time_HC_OPTS             += -H18m
-Complex_HC_OPTS          += -H10m
-IO_HC_OPTS	         += -H12m
-PrelMain_HC_OPTS	 += -fno-prune-tydecls # avoids an apparent bug; ToDo
+# Special options
+PrelStorable_HC_OPTS = -monly-3-regs
+PrelCError_HC_OPTS = +RTS -K4m -RTS
 
 #-----------------------------------------------------------------------------
 # 	Dependency generation
@@ -74,10 +64,32 @@ SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 #-----------------------------------------------------------------------------
 # 	Rules
 
+PrelPrimopWrappers.hs: ../../compiler/prelude/primops.txt
+	rm -f PrelPrimopWrappers.hs
+	../../utils/genprimopcode/genprimopcode  --make-haskell-wrappers \
+		< ../../compiler/prelude/primops.txt > PrelPrimopWrappers.hs
+
 PrelGHC.$(way_)hi	: PrelGHC.hi-boot
 	cp $< $@
 
-boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+boot :: PrelPrimopWrappers.hs PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+all :: PrelPrimopWrappers.hs
+
+DLL_DESCRIPTION="GHC-compiled Haskell Prelude"
+
+ifeq "$(DLLized)" "YES"
+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 += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+
+CLEAN_FILES +=  \
+	$(patsubst %.hsc, %.hs, $(HSC_SRCS)) \
+	$(patsubst %.hsc, %.hs.c, $(HSC_SRCS)) \
+	$(patsubst %.hsc, %.hs.h, $(HSC_SRCS))
 
 #-----------------------------------------------------------------------------
 # 	Installation; need to install .hi files as well as libraries
@@ -93,7 +105,10 @@ override datadir:=$(libdir)/imports/std
 #
 # Files to install from here
 # 
-INSTALL_LIBS  += $(LIBRARY)
-INSTALL_DATAS += $(HS_IFACES)
+ifeq "$(DLLized)" "YES"
+INSTALL_LIBS  += PrelMain.dll_o
+endif
+
+INSTALL_DATAS += PrelGHC.$(way_)hi
 
 include $(TOP)/mk/target.mk