Rework docker setup to make it easier to work around bugs on buildbots

llvm-svn: 349234

3 files changed, 19 insertions, 2 deletions

diff --git a/libcxx/utils/docker/debian9/Dockerfile b/libcxx/utils/docker/debian9/Dockerfile
index 560cbd14885..8dc43f40105 100644
--- a/libcxx/utils/docker/debian9/Dockerfile
+++ b/libcxx/utils/docker/debian9/Dockerfile
@@ -109,5 +109,7 @@ RUN apt-get install -y --no-install-recommends \
     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
diff --git a/libcxx/utils/docker/scripts/docker_start_buildbots.sh b/libcxx/utils/docker/scripts/docker_start_buildbots.sh
new file mode 100755
index 00000000000..1da3942583d
--- /dev/null
+++ b/libcxx/utils/docker/scripts/docker_start_buildbots.sh
@@ -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 "$@"
diff --git a/libcxx/utils/docker/scripts/run_buildbot.sh b/libcxx/utils/docker/scripts/run_buildbot.sh
index 10cc09b6f53..45f5a1cf6bf 100755
--- a/libcxx/utils/docker/scripts/run_buildbot.sh
+++ b/libcxx/utils/docker/scripts/run_buildbot.sh
@@ -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