CI support for riscv64gc-unknown-linux-gnu

rust-lang · May 13, 2020 · 3bd9e54 · 3bd9e54
1 parent 77ffd29
commit 3bd9e54
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/ci/actions-templates/README.md b/ci/actions-templates/README.md
@@ -56,6 +56,7 @@ system.
 | armv7-linux-androideabi       | Yes        | Two   | No     | No         |
 | i686-linux-android            | Yes        | Two   | No     | No         |
 | x86_64-linux-android          | Yes        | Two   | No     | No         |
+| riscv64gc-unknown-linux-gnu   | Yes        | ---   | No     | No         |
 | ----------------------------- | ---------- | ----- | ------ | ---------- |
 | x86_64-apple-darwin           | No         | One   | Yes    | Yes        |
 | ----------------------------- | ---------- | ----- | ------ | ---------- |

diff --git a/ci/actions-templates/linux-builds-template.yaml b/ci/actions-templates/linux-builds-template.yaml
@@ -46,6 +46,7 @@ jobs:
           - armv7-linux-androideabi       # skip-pr skip-master
           - i686-linux-android            # skip-pr skip-master
           - x86_64-linux-android          # skip-pr skip-master
+          - riscv64gc-unknown-linux-gnu   # skip-pr skip-master
         include:
           - target: x86_64-unknown-linux-gnu
             run_tests: YES

diff --git a/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile b/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile
@@ -0,0 +1,11 @@
+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
diff --git a/ci/fetch-rust-docker.bash b/ci/fetch-rust-docker.bash
@@ -32,6 +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 ;;
   *) exit ;;
 esac