X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=5b72cd089371e80074293fbda3177fa1bc37ab5f;hb=a103a9dc0de992716e62c30d7ac81c0bc0dbcdc5;hp=db136bfba462a901f9d1c512c2e4214e4be4e479;hpb=589b7946b0847a47d1a5493dcec0976c84814312;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index db136bf..5b72cd0 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -22,21 +22,27 @@ endif
 # 	Setting the standard variables
 #
 
+HC 	   = $(GHC_INPLACE)
+MKDEPENDHS = $(GHC_INPLACE)
+
 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
-
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+LIBOBJS = $(filter-out PrelHugs.$(way_)o,$(HS_OBJS))
+endif
 
 #-----------------------------------------------------------------------------
 # 	Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts) -fcompiling-prelude
+SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts)
 ifneq "$(way)" "dll"
 SRC_HC_OPTS += -static
 endif
 
+ifdef USE_REPORT_PRELUDE
+SRC_HC_OPTS += -DUSE_REPORT_PRELUDE=1
+endif
+
 #
 # Object and interface files have suffixes tagged with their ways
 #
@@ -44,14 +50,9 @@ ifneq "$(way)" ""
 SRC_HC_OPTS += -hisuf $(way_)hi
 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     += -H34m -K2m
+PrelNumExtra_HC_OPTS     += -H24m -K2m
 
 PrelPack_HC_OPTS	 += -K4m
 PrelBase_HC_OPTS         += -H12m
@@ -63,7 +64,6 @@ PrelHandle_HC_OPTS       += -H20m
 Time_HC_OPTS             += -H24m -K2m
 Complex_HC_OPTS          += -H10m
 IO_HC_OPTS	         += -H12m
-PrelMain_HC_OPTS	 += -fno-prune-tydecls # avoids an apparent bug; ToDo
 List_HC_OPTS             += -H8m
 Directory_HC_OPTS        += -H8m
 
@@ -81,15 +81,44 @@ PrelGHC.$(way_)hi	: PrelGHC.hi-boot
 boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
 DLL_NAME = HSprel.dll
+DLL_DESCRIPTION="GHC-compiled Haskell Prelude"
 DLL_IMPLIB_NAME = libHS_imp.a
-SRC_BLD_DLL_OPTS += --export-all --output-def=HSprel.def
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSprel.def DllVersionInfo.o
 SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHS_cbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits
 
+ifeq "$(way)" "dll"
+HS_SRCS := $(filter-out PrelMain.lhs PrelHugs.lhs, $(HS_SRCS))
+endif
 
+# PrelMain.dll_o isn't to be included in the final .a, 
+# but it needs to be generated
 ifeq "$(way)" "dll"
-HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS))
+all :: PrelMain.dll_o DllVersionInfo.o
+
 endif
 
+CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+
+#
+# Building PrelMain.dll_o is, unfortunately, somewhat tricky
+# with the current DLL setup. PrelMain.dll_o should refer to
+# all its imports bar Main.main_closure as residing in DLLs.
+# But, since the .hi's of PrelBase et al. is in the same
+# directory as PrelMain, the compiler will assume that they
+# reside in the same DLL as PrelMain & generate code accordingly.
+# 
+# So, we copy out PrelMain.lhs to ".." and build it there &
+# copy the gen'ed object file back in again.
+# 
+ifeq "$(way)" "dll"
+SplitObjs = NO
+PrelMain.dll_o : PrelMain.lhs
+	$(RM) ../PrelMain.lhs
+	$(CP) PrelMain.lhs ../
+	$(MAKE) -C .. PrelMain.dll_o way=dll HC=std/$(GHC_INPLACE) HC_OPTS="$(filter-out -fcompiling-prelude, $(HC_OPTS))"
+	$(MV) ../PrelMain.dll_o .
+	$(RM) ../PrelMain.lhs ../PrelMain.dll_hi
+endif
 
 #-----------------------------------------------------------------------------
 # 	Installation; need to install .hi files as well as libraries
@@ -106,6 +135,11 @@ override datadir:=$(libdir)/imports/std
 # Files to install from here
 # 
 INSTALL_LIBS  += $(LIBRARY)
-INSTALL_DATAS += $(HS_IFACES)
+ifeq "$(EnableWin32DLLs)" "YES"
+INSTALL_PROGS += $(DLL_NAME)
+INSTALL_LIBS  += $(patsubst %.a, %_imp.a, $(LIBRARY)) PrelMain.dll_o
+INSTALL_DATAS += dLL_ifs.hi
+endif
+INSTALL_DATAS += $(HS_IFACES) PrelGHC.$(way_)hi
 
 include $(TOP)/mk/target.mk