From: qrczak <unknown>
Date: Thu, 25 Jan 2001 10:44:34 +0000 (+0000)
Subject: [project @ 2001-01-25 10:44:34 by qrczak]
X-Git-Tag: Approximately_9120_patches~2832
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=cfca5e304ce1a321627de4837c0fdd2986c76563;p=ghc-hetmet.git

[project @ 2001-01-25 10:44:34 by qrczak]
Correctly generate HS*.o (first collect each module's object files, then
collect modules).
---

diff --git a/mk/target.mk b/mk/target.mk
index 5008e98..6384a55 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -421,18 +421,15 @@ ifeq "$(GHCI_LIBOBJS)" ""
 GHCI_LIBOBJS = $(LIBOBJS)
 endif
 
+$(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
 ifneq "$(HS_SRCS)" ""
 ifeq "$(SplitObjs)" "YES"
-$(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
-	( echo $(STUBOBJS) ; $(FIND) $(patsubst %.$(way_)o,%,$(GHCI_LIBOBJS)) -name '*.$(way_)o' -print ) | xargs ld -r -x -o $@
-else # not SplitObjs
-$(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
-	ld -r -x -o $@ $(GHCI_LIBOBJS)
+	$(foreach obj,$(GHCI_LIBOBJS), \
+	    ld -r -x -o $(obj)         \
+	    $(patsubst %.$(way_)o,%,$(obj))/*.$(way_)o &&) true
 endif
-else # no HS_SRCS
-$(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
-	ld -r -x -o $@ $(GHCI_LIBOBJS)
 endif
+	ld -r -x -o $@ $(GHCI_LIBOBJS) $(STUBOBJS)
 
 CLEAN_FILES += $(GHCI_LIBRARY)
 endif