diff options
| author | David Craven <david@craven.ch> | 2018-07-26 13:40:40 +0200 |
|---|---|---|
| committer | David Craven <david@craven.ch> | 2018-08-01 15:34:57 +0200 |
| commit | 7a5e8bdc020e2c169cd65b01e5befb66dc5a41c8 (patch) | |
| tree | cad43fbbaae1f07aa38ac14c4927f4cab2014076 | |
| parent | 302ddef1ac7a2cc7d2d9b8addaa467494a9a0c5c (diff) | |
| download | rust-7a5e8bdc020e2c169cd65b01e5befb66dc5a41c8.tar.gz rust-7a5e8bdc020e2c169cd65b01e5befb66dc5a41c8.zip | |
[RISCV] Enable CI.
| -rw-r--r-- | config.toml.example | 2 | ||||
| -rw-r--r-- | src/bootstrap/config.rs | 2 | ||||
| -rw-r--r-- | src/ci/docker/dist-various-1/Dockerfile | 1 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/config.toml.example b/config.toml.example index cc40e96b316..eb7cd61a1b0 100644 --- a/config.toml.example +++ b/config.toml.example @@ -61,7 +61,7 @@ # the same format as above, but since these targets are experimental, they are # not built by default and the experimental Rust compilation targets that depend # on them will not work unless the user opts in to building them. By default the -# `WebAssembly` target is enabled when compiling LLVM from scratch. +# `WebAssembly` and `RISCV` targets are enabled when compiling LLVM from scratch. #experimental-targets = "WebAssembly;RISCV" # Cap the number of parallel linker invocations when compiling LLVM. diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 0a8a5c87d0d..1a94d597ef8 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -507,7 +507,7 @@ impl Config { set(&mut config.llvm_link_shared, llvm.link_shared); config.llvm_targets = llvm.targets.clone(); config.llvm_experimental_targets = llvm.experimental_targets.clone() - .unwrap_or("WebAssembly".to_string()); + .unwrap_or("WebAssembly;RISCV".to_string()); config.llvm_link_jobs = llvm.link_jobs; config.llvm_clang_cl = llvm.clang_cl.clone(); } diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index 6302f550091..bfc5e712f76 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -102,6 +102,7 @@ ENV TARGETS=$TARGETS,thumbv6m-none-eabi ENV TARGETS=$TARGETS,thumbv7m-none-eabi ENV TARGETS=$TARGETS,thumbv7em-none-eabi ENV TARGETS=$TARGETS,thumbv7em-none-eabihf +ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \ diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index bbce87a7c9a..fd8fb54503a 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -89,6 +89,7 @@ static TARGETS: &'static [&'static str] = &[ "powerpc64-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", "powerpc64le-unknown-linux-musl", + "riscv32imac-unknown-none-elf", "s390x-unknown-linux-gnu", "sparc-unknown-linux-gnu", "sparc64-unknown-linux-gnu", |