X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=7b481c907fb05808c7d0e50e18bf7f8cbea3175b;hb=7f386840ce17159c13ff452d1099e0cbce7ddb5d;hp=37f713404754d33646abf01b036844a52a824207;hpb=678cfbcde9a360cd489cae8cfd238d637daf6fae;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 37f7134..7b481c9 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -27,6 +27,9 @@ MKDEPENDHS = $(GHC_INPLACE)
 
 LIBRARY = libHS$(_way).a
 LIBOBJS = $(HS_OBJS)
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+LIBOBJS = $(filter-out PrelHugs.o,$(HS_OBJS))
+endif
 
 #-----------------------------------------------------------------------------
 # 	Setting the GHC compile options
@@ -47,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
@@ -87,7 +87,7 @@ 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, $(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, 
@@ -114,6 +114,7 @@ CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 # odir for details)
 # 
 ifeq "$(way)" "dll"
+GhcLibHcOpts = -O
 PrelMain.dll_o : PrelMain.lhs
 	$(RM) ../PrelMain.lhs
 	$(CP) PrelMain.lhs ../