X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=8a7c780dd41f6c4ad0c70c491b6370175e2bb4dc;hb=6705e0ed6b24ec0bec7517f1386a37db928e5e13;hp=0fdeebca190f5c20899ec6ce51fe6e83708283e0;hpb=ec2e177faf6ed8ff934f0bd97cf77fcb0f2210bd;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 0fdeebc..8a7c780 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -34,6 +34,7 @@ endif
 PACKAGE = std
 
 BOOT_SRCS += PrelPrimopWrappers.hs
+CLEAN_FILES += PrelPrimopWrappers.hs
 
 #-----------------------------------------------------------------------------
 # 	Setting the GHC compile options
@@ -109,16 +110,18 @@ CLEAN_FILES += PrelGHC.hi-boot PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)
 # we don't want PrelMain in the GHCi library.
 GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
 
+# Turn off standard rule which creates HSstd.o from LIBOBJS.
+DONT_WANT_STD_GHCI_LIB_RULE=YES
 
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-LIBOBJS=$(GHCI_LIBOBJS)
+# 		Standard rule
+HSstd.o :: $(GHCI_LIBOBJS)
+	ld -r -x -o $@ $(GHCI_LIBOBJS)
+
 else
 # 		Rule for Win32 platform
 # Keep HSstd.o as a pseudo-target (I think)
 
-# Turn off standard rule which creates HSstd.o from LIBOBJS.
-DONT_WANT_STD_GHCI_LIB_RULE=YES
-
 HSstd.o :: $(GHCI_LIBOBJS)
 	ld -r -x -o HSstd1.o $(filter     Prel%, $(GHCI_LIBOBJS))
 	ld -r -x -o HSstd2.o $(filter-out Prel%, $(GHCI_LIBOBJS))