Browse Source

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>
pull/10/merge
Fam Zheng 12 years ago
committed by Paolo Bonzini
parent
commit
6295b98d7b
  1. 4
      rules.mak

4
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))

Loading…
Cancel
Save