X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=c2b9108bf113b3d22f0a775acdf85a9ab7be6385;hb=dc3a9adce050b1db078c939473c7e293721f5c2c;hp=5157ef13ea4a9b8207d2634fa9c8cedf87009d94;hpb=792c0b584d78fdab6834553b79f9b5d445ae80e6;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 5157ef1..c2b9108 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.29 2002/05/31 12:22:33 panne Exp $
+# $Id: Makefile,v 1.30 2002/06/04 19:12:53 sof Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -74,9 +74,18 @@ CLEAN_FILES += GHC/PrimopWrappers.hs
 #
 # The procedure differs from that in fptools/mk/target.mk in one way:
 #  (*) on Win32 we must split it into two, because a single .o file can't
-#      have more than 65536 relocations in it.
+#      have more than 65536 relocations in it [due to a bug in the GNU
+#      linker.]
 
+OBJECT_FILEFORMAT=unknown
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+OBJECT_FILEFORMAT=PEi
+endif
+ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
+OBJECT_FILEFORMAT=PEi
+endif
+
+ifeq "$(OBJECT_FILEFORMAT)" "PEi"
 
 # Turn off standard rule which creates HSbase.o from LIBOBJS.
 DONT_WANT_STD_GHCI_LIB_RULE=YES
@@ -85,7 +94,7 @@ GHCI_LIBOBJS = $(HS_OBJS)
 
 INSTALL_LIBS += HSbase1.o HSbase2.o
 
-endif # TARGETPLATFORM = i386-unknown-mingw32
+endif # OBJECT_FILEFORMAT = PEi
 
 
 # -----------------------------------------------------------------------------
@@ -117,10 +126,11 @@ haddock-docs : $(HS_PPS)
 
 include $(TOP)/mk/target.mk
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifeq "$(OBJECT_FILEFORMAT)" "PEi"
 HSbase.o : $(GHCI_LIBOBJS)
 	$(LD) -r $(LD_X) -o HSbase1.o $(filter     GHC/%, $(GHCI_LIBOBJS))
-	$(LD) -r $(LD_X) -o HSbase2.o $(filter-out GHC/%, $(GHCI_LIBOBJS))
+	$(LD) -r $(LD_X) -o HSbase2.o $(filter     Text/%, $(GHCI_LIBOBJS))
+	$(LD) -r $(LD_X) -o HSbase3.o $(filter-out GHC/% Text/%, $(GHCI_LIBOBJS))
 	@touch HSbase.o
-endif # TARGETPLATFORM = i386-unknown-mingw32
+endif # OBJECT_FILEFORMAT = PEi