From d6434e1042f3b0a6dfe1b1f615af369486f9b1fa Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 9 Oct 1999 00:00:47 +0000
Subject: Merge with 2.3.19.

---
 Rules.make | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Rules.make')

diff --git a/Rules.make b/Rules.make
index 948c33dcd..6f8a10f2e 100644
--- a/Rules.make
+++ b/Rules.make
@@ -73,11 +73,11 @@ ifdef O_TARGET
 ALL_O = $(OX_OBJS) $(O_OBJS)
 $(O_TARGET): $(ALL_O)
 	rm -f $@
-ifneq "$(strip $(ALL_O))" ""
-	$(LD) $(EXTRA_LDFLAGS) -r -o $@ $(ALL_O)
-else
-	$(AR) rcs $@
-endif
+    ifneq "$(strip $(ALL_O))" ""
+	$(LD) $(EXTRA_LDFLAGS) -r -o $@ $(filter $(ALL_O), $^)
+    else
+	$(AR) rcs $@ $(filter $(ALL_O), $^)
+    endif
 	@ ( \
 	    echo 'ifeq ($(strip $(subst $(comma),:,$(EXTRA_LDFLAGS) $(ALL_O))),$$(strip $$(subst $$(comma),:,$$(EXTRA_LDFLAGS) $$(ALL_O))))' ; \
 	    echo 'FILES_FLAGS_UP_TO_DATE += $@' ; \
-- 
cgit v1.2.3