X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=6384a55a783a760122a93948e916a3c71f690d1d;hb=cfca5e304ce1a321627de4837c0fdd2986c76563;hp=5008e98a56d6a290ebdc2581083694f887e67539;hpb=046619bb13c75e30907f0b8c1976ad49c8409465;p=ghc-hetmet.git

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