[project @ 2000-03-30 14:12:42 by rrt]

[ghc-hetmet.git] / ghc / lib / std / Makefile

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index ac33ac7..ba614e7 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -18,14 +18,18 @@ else
 SUBDIRS=
 endif
 
-HC = $(GHC)
-
 #-----------------------------------------------------------------------------
 #      Setting the standard variables
 #
 
+HC        = $(GHC_INPLACE)
+MKDEPENDHS = $(GHC_INPLACE)
+
 LIBRARY = libHS$(_way).a
 LIBOBJS = $(HS_OBJS)
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+LIBOBJS = $(filter-out PrelHugs.$(way_)o,$(HS_OBJS))
+endif
 
 #-----------------------------------------------------------------------------
 #      Setting the GHC compile options
@@ -46,9 +50,6 @@ ifneq "$(way)" ""
 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
@@ -83,10 +84,10 @@ 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
+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, $(HS_SRCS))
+HS_SRCS := $(filter-out PrelMain.lhs PrelHugs.lhs, $(HS_SRCS))
 endif
 
 # PrelMain.dll_o isn't to be included in the final .a, 
@@ -96,6 +97,8 @@ 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
@@ -108,10 +111,11 @@ endif
 # 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_OPTS="$(filter-out -fcompiling-prelude, $(HC_OPTS))"
+       $(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