diff options
| author | bors <bors@rust-lang.org> | 2019-01-14 00:59:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-14 00:59:54 +0000 |
| commit | a16e1a781de15f276d558f542ee40b45a0eab143 (patch) | |
| tree | a9c2ec423c99257a06706e970e4621a0ef0d4296 /src | |
| parent | 9aee7ed335cfcaad33a6f6492497588b3d421b2d (diff) | |
| parent | 65ac315efe3203d1e2e0de9e7642ac0daff1a35b (diff) | |
| download | rust-a16e1a781de15f276d558f542ee40b45a0eab143.tar.gz rust-a16e1a781de15f276d558f542ee40b45a0eab143.zip | |
Auto merge of #56954 - hug-dev:armv8m-main-ci, r=alexcrichton
Add dist builder for Armv8-M Mainline This commit adds the Armv8-M Mainline target 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. I took example on other pull requests doing the same thing for another target to make the changes. Please feel free to comment if things needs to be added or removed. Doing `./x.py dist --target thumbv8m.main-none-eabi` worked locally so I assume that this will also work on the CI. It will (I think) however need a new release of alexcrichton/cc-rs to include the pull request alexcrichton/cc-rs#363 @alexcrichton I hope to do the HardFloat version (`thumbv8m.main-none-eabihf`) and Baseline (`thumbv8m.base-none-eabi`) later, as fixes need to be done on compiler-builtins first to support those.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/dist-various-1/Dockerfile | 11 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index 4f8a3c0240e..76cdd367987 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -21,12 +21,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ patch \ libssl-dev \ pkg-config \ - gcc-arm-none-eabi \ libnewlib-arm-none-eabi \ - qemu-system-arm + qemu-system-arm \ +# software-properties-common for the add-apt-repository command + software-properties-common WORKDIR /build +# Use the team-gcc-arm-embedded PPA for a newer version of Arm GCC +RUN add-apt-repository ppa:team-gcc-arm-embedded/ppa && \ + apt-get update && \ + apt-get install -y --no-install-recommends gcc-arm-embedded + COPY dist-various-1/build-rumprun.sh /build RUN ./build-rumprun.sh @@ -103,6 +109,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,thumbv8m.main-none-eabi ENV TARGETS=$TARGETS,riscv32imc-unknown-none-elf ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf ENV TARGETS=$TARGETS,armebv7r-none-eabi diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index b00daa71677..8c1baa55bcd 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -90,6 +90,7 @@ static TARGETS: &'static [&'static str] = &[ "thumbv7em-none-eabi", "thumbv7em-none-eabihf", "thumbv7m-none-eabi", + "thumbv8m.main-none-eabi", "wasm32-unknown-emscripten", "wasm32-unknown-unknown", "x86_64-apple-darwin", |