HC = $(GHC_INPLACE)
MKDEPENDHS = $(GHC_INPLACE)
-LIBRARY = libHS$(_way).a
-LIBOBJS = $(HS_OBJS)
+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
+
+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
-ifneq "$(way)" "dll"
+SRC_HC_OPTS += -recomp -cpp -fvia-C -fglasgow-exts $(GhcLibHcOpts) $(PACKAGE)
+ifneq "$(DLLized)" "YES"
SRC_HC_OPTS += -static
endif
SRC_HC_OPTS += -hisuf $(way_)hi
endif
-# per-module flags
-PrelArrExtra_HC_OPTS += -monly-2-regs
-
# Far too much heap is needed to compile PrelNumExtra with -O at the
# moment, but there you go..
-PrelNumExtra_HC_OPTS += -H24m -K2m
-
-PrelPack_HC_OPTS += -K4m
-PrelBase_HC_OPTS += -H12m
-PrelRead_HC_OPTS += -H20m
-PrelTup_HC_OPTS += -H12m -K2m
-PrelNum_HC_OPTS += -H12m -K4m
-PrelArr_HC_OPTS += -H8m
-PrelHandle_HC_OPTS += -H20m
-Time_HC_OPTS += -H24m -K2m
-Complex_HC_OPTS += -H10m
-IO_HC_OPTS += -H12m
-List_HC_OPTS += -H8m
-Directory_HC_OPTS += -H8m
-
+<<<<<<< Makefile
+# PrelNumExtra_HC_OPTS += -H24m -K2m
+#
+# PrelPack_HC_OPTS += -K4m
+# PrelBase_HC_OPTS += -H12m
+# PrelRead_HC_OPTS += -H20m
+# PrelTup_HC_OPTS += -H12m -K2m
+# PrelNum_HC_OPTS += -H12m -K4m
+# PrelArr_HC_OPTS += -H8m
+# PrelHandle_HC_OPTS += -H20m
+# Time_HC_OPTS += -H24m -K2m
+# Complex_HC_OPTS += -H10m
+# IO_HC_OPTS += -H12m
+# List_HC_OPTS += -H8m
+# Directory_HC_OPTS += -H8m
+=======
+PrelNumExtra_HC_OPTS += +RTS -H24m -K2m -RTS
+>>>>>>> 1.50
+
+<<<<<<< Makefile
+=======
+PrelPack_HC_OPTS += +RTS -K4m -RTS
+PrelBase_HC_OPTS += +RTS -H12m -RTS
+PrelRead_HC_OPTS += +RTS -H20m -RTS
+PrelTup_HC_OPTS += +RTS -H12m -K2m -RTS
+PrelNum_HC_OPTS += +RTS -H12m -K4m -RTS
+PrelArr_HC_OPTS += +RTS -H8m -RTS
+PrelHandle_HC_OPTS += +RTS -H20m -RTS
+Time_HC_OPTS += +RTS -H24m -K2m -RTS
+Complex_HC_OPTS += +RTS -H10m -RTS
+IO_HC_OPTS += +RTS -H12m -RTS
+List_HC_OPTS += +RTS -H8m -RTS
+Directory_HC_OPTS += +RTS -H8m -RTS
+
+>>>>>>> 1.50
#-----------------------------------------------------------------------------
# Dependency generation
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 DllVersionInfo.o
-SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHScbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits
-ifeq "$(way)" "dll"
-HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS))
+ifeq "$(DLLized)" "YES"
+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"
-all :: PrelMain.dll_o DllVersionInfo.o
-
+ifeq "$(DLLized)" "YES"
+all :: PrelMain.dll_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"
-PrelMain.dll_o : PrelMain.lhs
- $(RM) ../PrelMain.lhs
- $(CP) PrelMain.lhs ../
- $(MAKE) -C .. PrelMain.dll_o way=dll HC_OPTS="$(filter-out -fcompiling-prelude, $(HC_OPTS))"
- $(MV) ../PrelMain.dll_o .
- $(RM) ../PrelMain.lhs ../PrelMain.dll_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
#-----------------------------------------------------------------------------
#
# Files to install from here
#
-INSTALL_LIBS += $(LIBRARY)
-ifeq "$(EnableWin32DLLs)" "YES"
-INSTALL_PROGS += $(DLL_NAME)
-INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY)) PrelMain.dll_o
-INSTALL_DATAS += dLL_ifs.hi
+ifeq "$(DLLized)" "YES"
+INSTALL_LIBS += PrelMain.dll_o
+endif
+
+INSTALL_DATAS += PrelGHC.$(way_)hi
+ifeq "$(DLLized)" "YES"
+INSTALL_DATAS := $(filter-out PrelHugs.$(way_)hi,$(INSTALL_DATAS))
endif
-INSTALL_DATAS += $(HS_IFACES) PrelGHC.$(way_)hi
include $(TOP)/mk/target.mk
projects / ghc-hetmet.git / blobdiff