From 9f4754d0cbb0e7c1db165212840a80494d7448de Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Wed, 4 Jul 2012 23:18:57 +1000 Subject: [PATCH] kvm tools: Support cross compilation Allow CROSS_COMPILE to be used to prefix CC as is done in the kernel Makefile. If CROSS_COMPILE is unset it has no effect, and still allows CC to be overridden. We need to fix a few places to use ARCH instead of uname_M directly, so that the overridden setting of ARCH takes effect. Signed-off-by: Michael Ellerman Signed-off-by: Pekka Enberg --- tools/kvm/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index 7a9d3b650895..501387b5c093 100644 --- a/tools/kvm/Makefile +++ b/tools/kvm/Makefile @@ -19,6 +19,8 @@ export E Q KINCL_PATH include config/utilities.mak include config/feature-tests.mak +CC := $(CROSS_COMPILE)$(CC) + FIND := find CSCOPE := cscope TAGS := ctags @@ -96,11 +98,11 @@ ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/sh[234].*/sh/ ) uname_M := $(shell uname -m | sed -e s/i.86/i386/) -ifeq ($(uname_M),i386) +ifeq ($(ARCH),i386) ARCH := x86 DEFINES += -DCONFIG_X86_32 endif -ifeq ($(uname_M),x86_64) +ifeq ($(ARCH),x86_64) ARCH := x86 DEFINES += -DCONFIG_X86_64 endif @@ -128,7 +130,7 @@ ifeq ($(ARCH),x86) ARCH_INCLUDE := x86/include endif # POWER/ppc: Actually only support ppc64 currently. -ifeq ($(uname_M), ppc64) +ifeq ($(ARCH), powerpc) DEFINES += -DCONFIG_PPC OBJS += powerpc/boot.o OBJS += powerpc/ioport.o -- 2.39.5