Commit-ID: d817eef41fcd32fbbc11619f17f9b60482f15c12 Gitweb: http://git.kernel.org/tip/d817eef41fcd32fbbc11619f17f9b60482f15c12 Author: Michael Ellerman <michael@xxxxxxxxxxxxxx> AuthorDate: Wed, 4 Jul 2012 23:18:58 +1000 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Wed, 4 Jul 2012 17:12:20 +0300 kvm tools: Cleanup ARCH & uname_M in Makefile The sed expression for ARCH seems to have been cribbed from the top-level kernel Makefile, and includes lots of architectures kvmtool doesn't support - strip it down. Also call uname -m directly there and get rid of uname_M. Signed-off-by: Michael Ellerman <michael@xxxxxxxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/Makefile | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index 501387b..f9e1ec1 100644 --- a/tools/kvm/Makefile +++ b/tools/kvm/Makefile @@ -90,14 +90,9 @@ OBJS += kvm-ipc.o OBJS += builtin-sandbox.o OBJS += virtio/mmio.o -# Additional ARCH settings for x86 -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ \ - -e s/s390x/s390/ -e s/parisc64/parisc/ \ - -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ - -e s/sh[234].*/sh/ ) - -uname_M := $(shell uname -m | sed -e s/i.86/i386/) +# Translate uname -m into ARCH string +ARCH ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/ppc.*/powerpc/) + ifeq ($(ARCH),i386) ARCH := x86 DEFINES += -DCONFIG_X86_32 -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|