diff options
| author | Gijs Burghoorn <me@gburghoorn.com> | 2023-08-31 17:49:02 +0200 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2023-08-31 23:12:32 +0200 |
| commit | d1229d008b3ed0c19f0433ba1b20cf0a3f64c4ef (patch) | |
| tree | 960b54f9ac262601216f8d104f8e0a8b7a03789a /library/stdarch/ci | |
| parent | 4be26a949710cc966d319b9464b703788f27de79 (diff) | |
| download | rust-d1229d008b3ed0c19f0433ba1b20cf0a3f64c4ef.tar.gz rust-d1229d008b3ed0c19f0433ba1b20cf0a3f64c4ef.zip | |
Fix: Add proper flags for RISCV64 ci
Diffstat (limited to 'library/stdarch/ci')
| -rw-r--r-- | library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile | 7 | ||||
| -rwxr-xr-x | library/stdarch/ci/run.sh | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile b/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile index b9b3c682eaf..67f5f4cdefe 100644 --- a/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile +++ b/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile @@ -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 diff --git a/library/stdarch/ci/run.sh b/library/stdarch/ci/run.sh index 0e33de89dbc..9923fa8e36e 100755 --- a/library/stdarch/ci/run.sh +++ b/library/stdarch/ci/run.sh @@ -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 |