diff options
| author | Eric Fiselier <eric@efcs.ca> | 2019-03-04 20:49:18 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2019-03-04 20:49:18 +0000 |
| commit | 8b73ab29c3643e33ff482394841cf061a066f6ea (patch) | |
| tree | ae3145ee5154facc3f558e7f8b37c4533d24a2c8 /libcxx/utils/docker | |
| parent | 394d4ccf693a82dea9b4233db9b7ba98713e54b8 (diff) | |
| download | bcm5719-llvm-8b73ab29c3643e33ff482394841cf061a066f6ea.tar.gz bcm5719-llvm-8b73ab29c3643e33ff482394841cf061a066f6ea.zip | |
Install GCC 5 on buildbots to replace GCC 4.9.
LLVM is dropping support for GCC 4.9. This patch adds
a GCC 5 installation to the buildbot image so we can upgrade
the 4.9 bot to GCC 5.
As a temporary workaround until zorg updates, we install GCC 5
as GCC 4.9.
llvm-svn: 355334
Diffstat (limited to 'libcxx/utils/docker')
| -rw-r--r-- | libcxx/utils/docker/debian9/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/utils/docker/debian9/Dockerfile b/libcxx/utils/docker/debian9/Dockerfile index f93670b4894..46875f42807 100644 --- a/libcxx/utils/docker/debian9/Dockerfile +++ b/libcxx/utils/docker/debian9/Dockerfile @@ -155,12 +155,12 @@ RUN /tmp/build_llvm_version.sh --install /opt/llvm-tot --branch master FROM builder-base AS buildbot # Copy over the GCC and Clang installations -COPY --from=gcc-49-builder /opt/gcc-4.9.4 /opt/gcc-4.9.4 +COPY --from=gcc-5-builder /opt/gcc-5 /opt/gcc-5 COPY --from=gcc-tot-builder /opt/gcc-tot /opt/gcc-tot COPY --from=llvm-4-builder /opt/llvm-4.0 /opt/llvm-4.0 -RUN ln -s /opt/gcc-4.9.4/bin/gcc /usr/local/bin/gcc-4.9 && \ - ln -s /opt/gcc-4.9.4/bin/g++ /usr/local/bin/g++-4.9 +RUN ln -s /opt/gcc-5/bin/gcc /usr/local/bin/gcc-4.9 && \ + ln -s /opt/gcc-5/bin/g++ /usr/local/bin/g++-4.9 RUN apt-get update && \ apt-get install -y --no-install-recommends \ |
