Skip to content

ci: riscv: Use new official riscv docker image #2421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2020
+1 −8
Merged

ci: riscv: Use new official riscv docker image #2421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
FROM rust-riscv64gc-unknown-linux-gnu


# We install a stable toolchain using rustup anyway, this should stop us getting
# confused and still having this toolchain in $PATH
RUN /usr/local/lib/rustlib/uninstall.sh
# Weirdly that doesn't remove these:
RUN rm /usr/local/bin/cargo /usr/local/bin/rust*

ENV CC_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-gcc \
CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-unknown-linux-gnu-gcc
2 changes: 1 addition & 1 deletion ci/fetch-rust-docker.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ case "$TARGET" in
x86_64-unknown-freebsd) image=dist-x86_64-freebsd ;;
x86_64-unknown-linux-gnu) image=dist-x86_64-linux ;;
x86_64-unknown-netbsd) image=dist-x86_64-netbsd ;;
riscv64gc-unknown-linux-gnu) image=dist-various-1 ;;
riscv64gc-unknown-linux-gnu) image=dist-riscv64-linux ;;
*) exit ;;
esac

Expand Down