diff options
| author |   Hollis Blanchard <hollisb@us.ibm.com> | 2008-10-28 16:52:37 +0100 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2008-10-29 14:44:47 +0200 |
| commit | 2c76eff8db04c019e6b6f15be7fc441bc0f34fdf (patch) | |
| tree | 1e826893a3808dfa0eff19cbc3ea29fae7828a99 | |
| parent | eda5d679ddcf9cac357debf2e8ff0d966849207a (diff) | |
kvm: external module: Treat NONARCH_CONFIG as a list
As discussed on the list the unifdef changes break powerpc (and more ?). A fix
is to treat NONARCH_CONFIG as a list instead of a single item.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | kvm/kernel/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kvm/kernel/Makefile b/kvm/kernel/Makefile index 20c495ba1..c905bdaca 100644 --- a/kvm/kernel/Makefile +++ b/kvm/kernel/Makefile @@ -25,8 +25,9 @@ _hack = mv $1 $1.orig && \ gawk -v version=$(version) -f $(ARCH_DIR)/hack-module.awk $1.orig \ | sed '/\#include/! s/\blapic\b/l_apic/g' > $1 && rm $1.orig +unifdef_uflags = $(foreach arch, $(NONARCH_CONFIG), -UCONFIG_$(arch)) unifdef = mv $1 $1.orig && \ - unifdef -DCONFIG_$(ARCH_CONFIG) -UCONFIG_$(NONARCH_CONFIG) $1.orig > $1; \ + unifdef -DCONFIG_$(ARCH_CONFIG) $(unifdef_uflags) $1.orig > $1; \ [ $$? -le 2 ] && rm $1.orig hack = $(call _hack,$T/$(strip $1)) |