diff options
| author | qtmlabs <qtmlabs@protonmail.com> | 2019-10-11 15:13:22 +0700 |
|---|---|---|
| committer | qtmlabs <qtmlabs@protonmail.com> | 2019-10-11 15:13:22 +0700 |
| commit | 90d0baf2b4ec7837b50f1d57ff79e31dbebf10c6 (patch) | |
| tree | 432a8173b7800143517234f8b8ee79bd4a331657 /src/ci/docker/dist-armv7-linux/Dockerfile | |
| parent | 000d90b11f7be70ffb7812680f7abc6deb52ec88 (diff) | |
| download | rust-90d0baf2b4ec7837b50f1d57ff79e31dbebf10c6.tar.gz rust-90d0baf2b4ec7837b50f1d57ff79e31dbebf10c6.zip | |
Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux
Diffstat (limited to 'src/ci/docker/dist-armv7-linux/Dockerfile')
| -rw-r--r-- | src/ci/docker/dist-armv7-linux/Dockerfile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ci/docker/dist-armv7-linux/Dockerfile b/src/ci/docker/dist-armv7-linux/Dockerfile index 170b8134d3e..d3ea563eab1 100644 --- a/src/ci/docker/dist-armv7-linux/Dockerfile +++ b/src/ci/docker/dist-armv7-linux/Dockerfile @@ -3,12 +3,7 @@ FROM ubuntu:16.04 COPY scripts/cross-apt-packages.sh /scripts/ RUN sh /scripts/cross-apt-packages.sh -# Ubuntu 16.04 (this container) ships with make 4, but something in the -# toolchains we build below chokes on that, so go back to make 3 -COPY scripts/make3.sh /scripts/ -RUN sh /scripts/make3.sh - -COPY scripts/crosstool-ng.sh /scripts/ +COPY crosstool-ng.sh /scripts/ RUN sh /scripts/crosstool-ng.sh COPY scripts/rustbuild-setup.sh /scripts/ @@ -16,7 +11,6 @@ RUN sh /scripts/rustbuild-setup.sh USER rustbuild WORKDIR /tmp -COPY dist-armv7-linux/patches/ /tmp/patches/ COPY dist-armv7-linux/build-toolchains.sh dist-armv7-linux/armv7-linux-gnueabihf.config /tmp/ RUN ./build-toolchains.sh |