From 68b54a5f4368ba1a66ae7d330bb95a8d6eb08c3c Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sun, 1 Apr 2018 18:50:21 +0200 Subject: add a dist-thumb builder to build rust-std for the THUMB targets the rust-std component only contains the core and compiler-builtins (+c +mem) crates cc #49382 --- src/ci/docker/dist-various-3/Dockerfile | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/ci/docker/dist-various-3/Dockerfile (limited to 'src/ci/docker') diff --git a/src/ci/docker/dist-various-3/Dockerfile b/src/ci/docker/dist-various-3/Dockerfile new file mode 100644 index 00000000000..06c80982f3c --- /dev/null +++ b/src/ci/docker/dist-various-3/Dockerfile @@ -0,0 +1,19 @@ +FROM ubuntu:17.10 + +COPY scripts/cross-apt-packages.sh /scripts/ +RUN sh /scripts/cross-apt-packages.sh + +RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends \ + gcc-arm-none-eabi \ + libnewlib-arm-none-eabi + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + +ENV TARGETS=thumbv6m-none-eabi +ENV TARGETS=$TARGETS,thumbv7m-none-eabi +ENV TARGETS=$TARGETS,thumbv7em-none-eabi +ENV TARGETS=$TARGETS,thumbv7em-none-eabihf + +ENV RUST_CONFIGURE_ARGS --disable-docs +ENV SCRIPT python2.7 ../x.py dist --target $TARGETS -- cgit 1.4.1-3-g733a5 From d0693548cdb4fe9e380f7c607c53a2e16821ebc2 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 3 Apr 2018 08:26:24 +0200 Subject: merge dist-various-3 into dist-various-1 --- .travis.yml | 2 -- src/ci/docker/dist-various-1/Dockerfile | 8 +++++++- src/ci/docker/dist-various-3/Dockerfile | 19 ------------------- 3 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 src/ci/docker/dist-various-3/Dockerfile (limited to 'src/ci/docker') diff --git a/.travis.yml b/.travis.yml index a67c6c79bbd..091a5abdaa2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,8 +116,6 @@ matrix: if: branch = auto - env: IMAGE=dist-various-2 DEPLOY=1 if: branch = auto - - env: IMAGE=dist-various-3 DEPLOY=1 - if: branch = auto - env: IMAGE=dist-aarch64-linux DEPLOY=1 if: branch = auto - env: IMAGE=dist-android DEPLOY=1 diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index b398e9a3c92..e61757ff5ee 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -20,7 +20,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ bzip2 \ patch \ libssl-dev \ - pkg-config + pkg-config \ + gcc-arm-none-eabi \ + libnewlib-arm-none-eabi WORKDIR /build @@ -78,6 +80,10 @@ ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabihf ENV TARGETS=$TARGETS,aarch64-unknown-linux-musl ENV TARGETS=$TARGETS,sparc64-unknown-linux-gnu ENV TARGETS=$TARGETS,x86_64-unknown-redox +ENV TARGETS=$TARGETS,thumbv6m-none-eabi +ENV TARGETS=$TARGETS,thumbv7m-none-eabi +ENV TARGETS=$TARGETS,thumbv7em-none-eabi +ENV TARGETS=$TARGETS,thumbv7em-none-eabihf # FIXME: remove armv5te vars after https://github.com/alexcrichton/cc-rs/issues/271 # get fixed and cc update diff --git a/src/ci/docker/dist-various-3/Dockerfile b/src/ci/docker/dist-various-3/Dockerfile deleted file mode 100644 index 06c80982f3c..00000000000 --- a/src/ci/docker/dist-various-3/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM ubuntu:17.10 - -COPY scripts/cross-apt-packages.sh /scripts/ -RUN sh /scripts/cross-apt-packages.sh - -RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends \ - gcc-arm-none-eabi \ - libnewlib-arm-none-eabi - -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh - -ENV TARGETS=thumbv6m-none-eabi -ENV TARGETS=$TARGETS,thumbv7m-none-eabi -ENV TARGETS=$TARGETS,thumbv7em-none-eabi -ENV TARGETS=$TARGETS,thumbv7em-none-eabihf - -ENV RUST_CONFIGURE_ARGS --disable-docs -ENV SCRIPT python2.7 ../x.py dist --target $TARGETS -- cgit 1.4.1-3-g733a5