diff options
author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-03-27 18:56:16 +0100 |
---|---|---|
committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-03-27 18:56:16 +0100 |
commit | 2a92e61c7469e4ce4340b64fad59508a71b6efb1 (patch) | |
tree | ac6dbedc588c8ca0a2644bf51756a9797168567f | |
parent | 4799ad6121055c7a95c5a9c3c76d15706abafb6d (diff) | |
download | compcert-kvx-2a92e61c7469e4ce4340b64fad59508a71b6efb1.tar.gz compcert-kvx-2a92e61c7469e4ce4340b64fad59508a71b6efb1.zip |
fix config for K1C PPC RV32 for CI
-rw-r--r-- | .gitlab-ci.yml | 4 | ||||
-rwxr-xr-x | config_rv32.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa215d38..1e392b2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ build_ia32: stage: build image: "coqorg/coq" before_script: + - sudo apt-get -y install gcc-multilib - opam switch 4.07.1+flambda - eval `opam config env` - opam install -y menhir @@ -90,7 +91,7 @@ build_ppc: image: "coqorg/coq" before_script: - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - - sudo apt-get -y install gcc-powerpc-linux-gnu qemu-user + - sudo apt-get -y install gcc-multilib-powerpc qemu-user - opam switch 4.07.1+flambda - eval `opam config env` - opam install -y menhir @@ -161,7 +162,6 @@ build_k1c: script: - ./config_k1c.sh -no-runtime-lib - make -j "$NJOBS" - - cd test && make CCOMPOPTS=-static all rules: - if: '$CI_COMMIT_BRANCH == "mppa-work"' when: always diff --git a/config_rv32.sh b/config_rv32.sh index 654cacfa..a5a5cf1c 100755 --- a/config_rv32.sh +++ b/config_rv32.sh @@ -1 +1 @@ -exec ./config_simple.sh rv32-linux --toolprefix riscv64-unknown-elf- "$@" +exec ./config_simple.sh rv32-linux --toolprefix riscv64-linux-gnu- "$@" |