From d0b8ed2ab2979bfef689c5c801a73434b0abab51 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Sat, 28 Mar 2020 13:56:19 +0100 Subject: more fixes for CI --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf7361f8..119fa44e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ build_ia32: - ./config_ia32.sh - make -j "$NJOBS" - make -C test all test - - make -C test/monniaux/yarpgen +# - make -C test/monniaux/yarpgen disabled due to -m32/-m64 issues rules: - if: '$CI_COMMIT_BRANCH == "mppa-work"' when: always @@ -81,7 +81,7 @@ build_arm: - ./config_arm.sh - make -j "$NJOBS" - make -C test DIRS="c compression spass regression" CCOMPOPTS=-static SIMU='qemu-arm' EXECUTE='qemu-arm' all test - - make -C test/monniaux/yarpgen -k TARGET_CC='arm-linux-gnu-gcc' EXECUTE='qemu-arm' CCOMPOPTS='-static' TARGET_CFLAGS='-static' + - make -C test/monniaux/yarpgen -k TARGET_CC='arm-linux-gnueabihf-gcc' EXECUTE='qemu-arm' CCOMPOPTS='-static' TARGET_CFLAGS='-static' rules: - if: '$CI_COMMIT_BRANCH == "mppa-work"' when: always -- cgit