aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Cohen <arthur.cohen@embecosm.com>2023-03-28 11:15:41 +0200
committerPhilip Herron <philip.herron@embecosm.com>2023-03-29 21:16:30 +0000
commit87a0a8f84f56002b5c6f3c08dcce831ba7759eed (patch)
treee4947d36519ef19ead01e69a07ac673162a29b66
parent70b889b90ae982a2c0c6fe8596d9885d5dcc644f (diff)
downloadgcc-87a0a8f84f56002b5c6f3c08dcce831ba7759eed.zip
gcc-87a0a8f84f56002b5c6f3c08dcce831ba7759eed.tar.gz
gcc-87a0a8f84f56002b5c6f3c08dcce831ba7759eed.tar.bz2
docker: Do not run update-alternatives on invalid path
We do not need to set the system's compiler to `gccrs`, as we are mostly interested in *having* gccrs - not necessarily using it as a C and C++ compiler as well. ChangeLog: * Dockerfile: Remove update-alternatives invocation. Co-authored-by: Marc Poulhiès <dkm@kataplop.net>
-rw-r--r--Dockerfile5
1 files changed, 0 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile
index 759b934..8e73f20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,11 +64,6 @@ RUN /bin/sh -c set -ex; \
echo '/usr/local/lib64' > /etc/ld.so.conf.d/local-lib64.conf; \
ldconfig -v
-RUN /bin/sh -c set -ex; \
- dpkg-divert --divert /usr/bin/gcc.orig --rename /usr/bin/gcc; \
- 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:latest
COPY --from=gcc-builder /usr/ /usr/
COPY --from=gcc-builder /GCCRS_BUILD /GCCRS_BUILD