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

diff --git a/libcxx/utils/docker/debian9/Dockerfile b/libcxx/utils/docker/debian9/Dockerfile
index f93670b..46875f4 100644 (file)
--- 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 \