[CRIU] [PATCH] test/arm: Fix building on armv7l architecture

Laurent Dufour ldufour at linux.vnet.ibm.com
Tue Feb 2 09:18:32 PST 2016


The issue here is that ARCH is not overwritten if the caller Makefile
already define it, and the upper Makefile is not overwriting the ARCH
define to "arm", when it is "armv7l" for instance, so the SRCARCH is
set to "armv7l" which is wrong.

With this patch, SRCARCH is using the inherinted define if called from
the top level Makefile.

This is required to build test on armv7l architecture (qemu).

Signed-off-by: Laurent Dufour <ldufour at linux.vnet.ibm.com>
---
 test/zdtm/Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 16e89874f306..5e0d4200b885 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -8,7 +8,7 @@ ARCH ?= $(shell uname -m | sed		\
 		-e s/mips.*/mips/	\
 		-e s/sh[234].*/sh/)
 
-SRCARCH := $(ARCH)
+SRCARCH ?= $(ARCH)
 
 ifeq ($(ARCH),i386)
 	SRCARCH := x86
-- 
1.9.1



More information about the CRIU mailing list