projects
/
haskell-directory.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
07545ed
)
[project @ 2003-12-17 17:13:47 by sof]
author
sof
<unknown>
Wed, 17 Dec 2003 17:13:47 +0000
(17:13 +0000)
committer
sof
<unknown>
Wed, 17 Dec 2003 17:13:47 +0000
(17:13 +0000)
merge rev 1.48.2.4
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
26a6300
..
cd27958
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-127,7
+127,7
@@
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 Text/%, $(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 Text/%, $(GHCI_LIBOBJS))
- $(LD) -r $(LD_X) -o HSbase3.o $(filter-out GHC/% Text/%, $(GHCI_LIBOBJS))
+ $(LD) -r $(LD_X) -o HSbase3.o $(filter-out GHC/% Text/%, $(GHCI_LIBOBJS) $(STUBOBJS))
@touch HSbase.o
endif # OBJECT_FILEFORMAT = PEi
@touch HSbase.o
endif # OBJECT_FILEFORMAT = PEi