Skip to content

Commit 6cf162d

Browse files
committed
ci: riscv: Use new official build docker image
Merged in rust-lang/rust#72973
1 parent 22dc71a commit 6cf162d

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
FROM rust-riscv64gc-unknown-linux-gnu
22

3-
4-
# We install a stable toolchain using rustup anyway, this should stop us getting
5-
# confused and still having this toolchain in $PATH
6-
RUN /usr/local/lib/rustlib/uninstall.sh
7-
# Weirdly that doesn't remove these:
8-
RUN rm /usr/local/bin/cargo /usr/local/bin/rust*
9-
103
ENV CC_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-gcc \
114
CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-unknown-linux-gnu-gcc

ci/fetch-rust-docker.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ case "$TARGET" in
3232
x86_64-unknown-freebsd) image=dist-x86_64-freebsd ;;
3333
x86_64-unknown-linux-gnu) image=dist-x86_64-linux ;;
3434
x86_64-unknown-netbsd) image=dist-x86_64-netbsd ;;
35-
riscv64gc-unknown-linux-gnu) image=dist-various-1 ;;
35+
riscv64gc-unknown-linux-gnu) image=dist-riscv64-linux ;;
3636
*) exit ;;
3737
esac
3838

0 commit comments

Comments
 (0)