[libcxx] r349234 - Rework docker setup to make it easier to work around bugs on buildbots

[Eric Fiselier]

Author: ericwf
Date: Fri Dec 14 19:24:33 2018
New Revision: 349234

URL: http://llvm.org/viewvc/llvm-project?rev=349234&view=rev
Log:
Rework docker setup to make it easier to work around bugs on buildbots

Added:
    libcxx/trunk/utils/docker/scripts/docker_start_buildbots.sh   (with props)
Modified:
    libcxx/trunk/utils/docker/debian9/Dockerfile
    libcxx/trunk/utils/docker/scripts/run_buildbot.sh

Modified: libcxx/trunk/utils/docker/debian9/Dockerfile
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/docker/debian9/Dockerfile?rev=349234&r1=349233&r2=349234&view=diff
==============================================================================
--- libcxx/trunk/utils/docker/debian9/Dockerfile (original)
+++ libcxx/trunk/utils/docker/debian9/Dockerfile Fri Dec 14 19:24:33 2018
@@ -109,5 +109,7 @@ RUN apt-get install -y --no-install-reco
     python \
     buildbot-slave
 
-ADD scripts /libcxx-scripts/
-RUN /libcxx-scripts/install_clang_packages.sh
+ADD scripts/install_clang_packages.sh /tmp/install_clang_packages.sh
+RUN /tmp/install_clang_packages.sh && rm /tmp/install_clang_packages.sh
+
+RUN git clone https://git.llvm.org/git/libcxx.git /libcxx

Added: libcxx/trunk/utils/docker/scripts/docker_start_buildbots.sh
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/docker/scripts/docker_start_buildbots.sh?rev=349234&view=auto
==============================================================================
--- libcxx/trunk/utils/docker/scripts/docker_start_buildbots.sh (added)
+++ libcxx/trunk/utils/docker/scripts/docker_start_buildbots.sh Fri Dec 14 19:24:33 2018
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -x
+
+# Update the libc++ sources in the image in order to use the most recent version of
+# run_buildbots.sh
+cd /libcxx
+git pull
+source utils/docker/scripts/run_buildbots.sh "$@"

Propchange: libcxx/trunk/utils/docker/scripts/docker_start_buildbots.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: libcxx/trunk/utils/docker/scripts/run_buildbot.sh
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/docker/scripts/run_buildbot.sh?rev=349234&r1=349233&r2=349234&view=diff
==============================================================================
--- libcxx/trunk/utils/docker/scripts/run_buildbot.sh (original)
+++ libcxx/trunk/utils/docker/scripts/run_buildbot.sh Fri Dec 14 19:24:33 2018
@@ -12,6 +12,13 @@ mkdir -p $BOT_DIR
 apt-get update -y
 apt-get upgrade -y
 
+# FIXME(EricWF): Remove this hack. It's only in place to temporarily fix linking libclang_rt from the
+# debian packages.
+# WARNING: If you're not a buildbot, DO NOT RUN!
+apt-get install lld-8
+rm /usr/bin/ld
+ln -s /usr/bin/lld-8 /usr/bin/ld
+
 systemctl set-property buildslave.service TasksMax=100000
 
 buildslave stop $BOT_DIR