From fc900ee6c9d749c81e7b72e6bcea1866cfca5dbb Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 26 Aug 2016 22:59:26 -0700 Subject: [PATCH] Update the mips docker image Use the standard mips compilers from Ubuntu now --- ci/docker/mips-unknown-linux-gnu/Dockerfile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ci/docker/mips-unknown-linux-gnu/Dockerfile b/ci/docker/mips-unknown-linux-gnu/Dockerfile index 8eb6a26b..6194026a 100644 --- a/ci/docker/mips-unknown-linux-gnu/Dockerfile +++ b/ci/docker/mips-unknown-linux-gnu/Dockerfile @@ -1,13 +1,10 @@ -FROM ubuntu:15.10 +FROM ubuntu:16.04 RUN apt-get update RUN apt-get install -y --no-install-recommends \ - software-properties-common gcc libc6-dev qemu-user -RUN add-apt-repository ppa:angelsl/mips-cross -RUN apt-get update -RUN apt-get install -y --no-install-recommends \ - gcc-5-mips-linux-gnu libc6-dev-mips-cross + gcc libc6-dev qemu-user ca-certificates \ + gcc-mips-linux-gnu libc6-dev-mips-cross \ + qemu-system-mips -ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc-5 \ - CC_mips_unknown_linux_gnu=mips-linux-gnu-gcc-5 \ +ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc \ PATH=$PATH:/rust/bin