aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Brucker <jean-philippe@linaro.org>2022-07-22 15:17:30 +0100
committerWill Deacon <will@kernel.org>2022-08-04 15:51:33 +0100
commitae22ac7a81e5f59b8f93db6127a8797500836f60 (patch)
tree0787702739fc06460486017db07d9cbdf69dcea5
parent3863f34bd76723358b4ec7d44a12a4b6b990ceb5 (diff)
downloadkvmtool-ae22ac7a81e5f59b8f93db6127a8797500836f60.tar.gz
Makefile: Fix ARCH override
Variables set on the command-line are not overridden by normal assignments. So when passing ARCH=x86_64 on the command-line, build fails: Makefile:227: *** This architecture (x86_64) is not supported in kvmtool. Use the 'override' directive to force the ARCH reassignment. Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Tested-by: Alexandru Elisei <alexandru.elisei@arm.com> Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> Link: https://lore.kernel.org/r/20220722141731.64039-3-jean-philippe@linaro.org Signed-off-by: Will Deacon <will@kernel.org>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f0df76f4..faae0da2 100644
--- a/Makefile
+++ b/Makefile
@@ -115,11 +115,11 @@ ARCH ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/ppc.*/powerpc/ \
-e s/riscv64/riscv/ -e s/riscv32/riscv/)
ifeq ($(ARCH),i386)
- ARCH := x86
+ override ARCH = x86
DEFINES += -DCONFIG_X86_32
endif
ifeq ($(ARCH),x86_64)
- ARCH := x86
+ override ARCH = x86
DEFINES += -DCONFIG_X86_64
ARCH_PRE_INIT = x86/init.S
endif