From 85d78c1b8dd52488a0d572b2e3ff9ebdde99ab37 Mon Sep 17 00:00:00 2001
From: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Wed, 16 Feb 2022 17:11:38 +0100
Subject: [PATCH] dockerfile: Install cargo-gccrs alongside gccrs

---
 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8ef31ae1f63a..1ca3b168358e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:latest AS gcc-builder
 
 RUN apt-get update; \
     DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
@@ -67,5 +67,8 @@ RUN /bin/sh -c set -ex; \
     dpkg-divert --divert /usr/bin/g++.orig --rename /usr/bin/g++; \
     update-alternatives --install /usr/bin/cc cc /usr/local/bin/gcc 999
 
+FROM rust
+COPY --from=gcc-builder /usr/ /usr/
+RUN cargo install --git https://github.com/Rust-GCC/cargo-gccrs cargo-gccrs
 
 CMD ["bash"]