Skip to content

Commit f17c175

Browse files
coastalwhiteAmanieu
authored andcommitted
Fix: Add proper flags for RISCV64 ci
1 parent 6b9082f commit f17c175

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \
5-
gcc-riscv64-linux-gnu libc6-dev-riscv64-cross \
6-
qemu-user
5+
gcc-riscv64-linux-gnu libc6-dev-riscv64-cross
76

87
ENV CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-linux-gnu-gcc \
9-
CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER="qemu-riscv64 -L /usr/riscv64-linux-gnu" \
8+
CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER="qemu-riscv64 -L /usr/riscv64-linux-gnu -cpu rv64,zk=true" \
109
OBJDUMP=riscv64-linux-gnu-objdump

ci/run.sh

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

0 commit comments

Comments
 (0)