user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: Add proper flags for RISCV64 ci

Browse source
This commit is contained in:
Gijs Burghoorn 2023-08-31 17:49:02 +02:00 • committed by Amanieu d'Antras
parent 4be26a9497
commit d1229d008b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile
View file

@ -1,10 +1,9 @@
FROM ubuntu:22.04
FROM ubuntu:23.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \
gcc-riscv64-linux-gnu libc6-dev-riscv64-cross \
qemu-user
gcc-riscv64-linux-gnu libc6-dev-riscv64-cross
ENV CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-linux-gnu-gcc \
CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER="qemu-riscv64 -L /usr/riscv64-linux-gnu" \
CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER="qemu-riscv64 -L /usr/riscv64-linux-gnu -cpu rv64,zk=true" \
OBJDUMP=riscv64-linux-gnu-objdump

1
library/stdarch/ci/run.sh
View file

@ -47,6 +47,7 @@ case ${TARGET} in
# Some of our test dependencies use the deprecated `gcc` crates which
# doesn't detect RISC-V compilers automatically, so do it manually here.
riscv64*)
export RUSTFLAGS="${RUSTFLAGS} -Ctarget-feature=+zk"
export TARGET_CC="riscv64-linux-gnu-gcc"
;;
esac