diff options
| author | Fam Zheng <famz@redhat.com> | 2014-03-14 10:21:05 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-17 13:21:11 +0100 |
| commit | 6295b98d7b767c377d88fa787ca62603a8ca6adb (patch) | |
| tree | 4184839bef0bdfee17cbb2e7ae590692382d99a0 | |
| parent | f4b11eee2f562c23b3efc33b96ba4542c9ca81aa (diff) | |
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>
| -rw-r--r-- | rules.mak | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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)) |