[CRIU] [PATCH 3/7] travis: fix clang builds

Kir Kolyshkin kir at openvz.org
Wed Mar 15 16:17:20 PDT 2017


As pointed out by Andrey, arch clang tests are using gcc regardless
of CLANG=1 set in travis environment.

Frankly, I do not understand how it worked before (while being
pretty sure it worked!), but here is a way to fix it.

Reported-by: Andrey Vagin <avagin at virtuozzo.com>
Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 scripts/travis/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/travis/Makefile b/scripts/travis/Makefile
index 37721aa..0dadd65 100644
--- a/scripts/travis/Makefile
+++ b/scripts/travis/Makefile
@@ -6,9 +6,15 @@ after_success:
 	./travis-after_success
 .PHONY: after_success
 
+target-suffix =
+ifdef CLANG
+	target-suffix = -clang
+endif
+
 alpine:
-	$(MAKE) -C ../build alpine
+	$(MAKE) -C ../build $@$(target-suffix)
 	docker run --rm -it --privileged -v /lib/modules:/lib/modules criu-alpine ./test/zdtm.py run -t zdtm/static/env00
 
+
 %:
-	$(MAKE) -C ../build $@
+	$(MAKE) -C ../build $@$(target-suffix)
-- 
2.9.3



More information about the CRIU mailing list