projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-06-06 16:01:37 by simonpj]
[ghc-base.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
917f0a2
..
c2b9108
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.28 2002/05/27 14:30:49 simonmar Exp $
+# $Id: Makefile,v 1.30 2002/06/04 19:12:53 sof Exp $
TOP=..
include $(TOP)/mk/boilerplate.mk
TOP=..
include $(TOP)/mk/boilerplate.mk
@@
-35,6
+35,7
@@
ALL_DIRS = \
Text/Html \
Text/PrettyPrint \
Text/ParserCombinators \
Text/Html \
Text/PrettyPrint \
Text/ParserCombinators \
+ Text/ParserCombinators/Parsec \
Text/Regex \
Text/Show \
Text/Read
Text/Regex \
Text/Show \
Text/Read
@@
-73,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
#
# 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"
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
# Turn off standard rule which creates HSbase.o from LIBOBJS.
DONT_WANT_STD_GHCI_LIB_RULE=YES
@@
-84,7
+94,7
@@
GHCI_LIBOBJS = $(HS_OBJS)
INSTALL_LIBS += HSbase1.o HSbase2.o
INSTALL_LIBS += HSbase1.o HSbase2.o
-endif # TARGETPLATFORM = i386-unknown-mingw32
+endif # OBJECT_FILEFORMAT = PEi
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
@@
-116,10
+126,11
@@
haddock-docs : $(HS_PPS)
include $(TOP)/mk/target.mk
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))
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
@touch HSbase.o
-endif # TARGETPLATFORM = i386-unknown-mingw32
+endif # OBJECT_FILEFORMAT = PEi