From: Fam Zheng <famz@redhat.com>
Date: Fri, 14 Mar 2014 02:21:05 +0000 (+0800)
Subject: rules.mak: Fix per object libs extraction
X-Git-Tag: qemu-xen-4.5.0-rc1~102^2~3
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6295b98d7b767c377d88fa787ca62603a8ca6adb;p=qemu-upstream-4.5-testing.git

rules.mak: Fix per object libs extraction

Don't sort the extracted options, sort the objects.

Reported-by: Christian Mahnke <cmahnke@googlemail.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/rules.mak b/rules.mak
index 9dda9f760..5c454d80d 100644
--- a/rules.mak
+++ b/rules.mak
@@ -23,8 +23,8 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
 QEMU_INCLUDES += -I$(<D) -I$(@D)
 
 maybe-add = $(filter-out $1, $2) $1
-extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs)) \
-                  $(foreach o,$(call expand-objs,$1),$($o-libs))))
+extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs))) \
+                  $(foreach o,$(call expand-objs,$1),$($o-libs)))
 expand-objs = $(strip $(sort $(filter %.o,$1)) \
                   $(foreach o,$(filter %.mo,$1),$($o-objs)) \
                   $(filter-out %.o %.mo,$1))