From f2e691354a0ea1988de3242e9bad9e4170bd5e03 Mon Sep 17 00:00:00 2001 From: Sylvain Boulmé Date: Wed, 24 Mar 2021 10:46:49 +0100 Subject: fix CI arm and armhf --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f992502..66aab49c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,13 +92,15 @@ build_arm: image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda before_script: - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - - sudo apt-get -y install gcc-arm-linux-gnueabi qemu-user + - sudo apt-get -y install gcc-arm-linux-gnueabi libc6-dev-armel-cross qemu-user - eval `opam config env` - opam update - opam install -y menhir script: - ./config_arm.sh - make -j "$NJOBS" + - export LD_LIBRARY_PATH=/usr/arm-linux-gnueabi/lib + - sudo ln -s /usr/arm-linux-gnueabi/lib/ld-linux.so.3 /lib # FIXME: UGLY ! - make -C test CCOMPOPTS=-static SIMU='qemu-arm' EXECUTE='qemu-arm' all test - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='arm-linux-gnueabi-gcc' EXECUTE='qemu-arm' CCOMPOPTS='-static' TARGET_CFLAGS='-static' BITS=32 rules: @@ -116,13 +118,15 @@ build_armhf: image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda before_script: - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - - sudo apt-get -y install gcc-arm-linux-gnueabihf qemu-user + - sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user - eval `opam config env` - opam update - opam install -y menhir script: - ./config_armhf.sh - make -j "$NJOBS" + - export LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib + - sudo ln -s /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3 /lib # FIXME: UGLY ! - make -C test CCOMPOPTS=-static SIMU='qemu-arm' EXECUTE='qemu-arm' all test - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='arm-linux-gnueabihf-gcc' EXECUTE='qemu-arm' CCOMPOPTS='-static' TARGET_CFLAGS='-static' BITS=32 rules: -- cgit