diff options
| author | bors <bors@rust-lang.org> | 2019-04-03 14:23:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-03 14:23:13 +0000 |
| commit | f8673e0ad85e98997faa76fa7edc99c5825f46ee (patch) | |
| tree | 5b21911f8e8a299d309e0649d5614d3dd7e8cd7e | |
| parent | 0ba7d41b83132ae681dc8746bf23628f86f8a468 (diff) | |
| parent | e83349975b549ec9fa54cd590843607a9a60fb66 (diff) | |
| download | rust-f8673e0ad85e98997faa76fa7edc99c5825f46ee.tar.gz rust-f8673e0ad85e98997faa76fa7edc99c5825f46ee.zip | |
Auto merge of #59182 - hug-dev:armv8m-base-hf, r=alexcrichton
Add dist builder for Armv8-M Baseline and HF This commit adds the Armv8-M Baseline and Armv8-M Mainline with FPU targets in the list of targets that get their dist components built. It also update the build-manifest so that this target gets also its dist components uploaded. Made possible with the recent change merged in `compiler-builtins`: rust-lang-nursery/compiler-builtins#276 A new `compiler-builtins` might be necessary for successfull compilation of the artefacts of those targets.
| -rw-r--r-- | src/ci/docker/dist-various-1/Dockerfile | 2 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index f80293b182e..a722a418391 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -109,7 +109,9 @@ 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,thumbv8m.base-none-eabi ENV TARGETS=$TARGETS,thumbv8m.main-none-eabi +ENV TARGETS=$TARGETS,thumbv8m.main-none-eabihf ENV TARGETS=$TARGETS,riscv32imc-unknown-none-elf ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf ENV TARGETS=$TARGETS,riscv64imac-unknown-none-elf diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 0611e53d092..61cc78ad807 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -103,7 +103,9 @@ static TARGETS: &[&str] = &[ "thumbv7em-none-eabi", "thumbv7em-none-eabihf", "thumbv7m-none-eabi", + "thumbv8m.base-none-eabi", "thumbv8m.main-none-eabi", + "thumbv8m.main-none-eabihf", "wasm32-unknown-emscripten", "wasm32-unknown-unknown", "wasm32-unknown-wasi", |