about summary refs log tree commit diff
diff options
context:
space:
mode:
authorHugues de Valon <hugues.devalon@arm.com>2019-01-03 13:42:02 +0000
committerHugues de Valon <hugues.devalon@arm.com>2019-01-09 14:50:29 +0000
commitf0d4158db6e3199cdd1dd2f23e4d20a122d613eb (patch)
tree02ae7a29199cbd15dea5c22904684a985afda091
parent40388ef7be9e29bb0dbf930b5ba4615a245941ec (diff)
downloadrust-f0d4158db6e3199cdd1dd2f23e4d20a122d613eb.tar.gz
rust-f0d4158db6e3199cdd1dd2f23e4d20a122d613eb.zip
Replace Arm GCC to a more recent version
The version included in Ubuntu 16.04 repositories in the dist-various-1
docker, Arm GCC version 4.9, does not support the new Armv8-M
architecture.
This commit adds the team-gcc-arm-embedded PPA to get through APT a
newer version of Arm GCC.
-rw-r--r--src/ci/docker/dist-various-1/Dockerfile10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile
index f36ab13d5fd..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