Skip to content

Commit

Permalink
rules.mak: Fix per object libs extraction
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Fam Zheng authored and bonzini committed Mar 17, 2014
1 parent f4b11ee commit 6295b98
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rules.mak
Expand Up @@ -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))
Expand Down

0 comments on commit 6295b98

Please sign in to comment.