about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
m---------src/compiler-rt0
-rw-r--r--src/etc/Dockerfile8
2 files changed, 7 insertions, 1 deletions
diff --git a/src/compiler-rt b/src/compiler-rt
-Subproject 57315f7e07d09b6f0341ebbcd50dded6c20d782
+Subproject a1ef94b76029780a510bc2dc9c6a791bd091ff1
diff --git a/src/etc/Dockerfile b/src/etc/Dockerfile
index f1c56d8d396..94be84a3ebd 100644
--- a/src/etc/Dockerfile
+++ b/src/etc/Dockerfile
@@ -21,7 +21,13 @@ FROM ubuntu:xenial
 RUN apt-get update && apt-get -y install \
     curl g++ gdb git make \
     libedit-dev zlib1g-dev \
-    llvm-3.7-tools
+    llvm-3.7-tools cmake
+
+# When we compile compiler-rt we pass it the llvm-config we just installed on
+# the system, but unfortunately it doesn't infer correctly where
+# LLVMConfig.cmake is so we need to coerce it a bit...
+RUN mkdir -p /usr/lib/llvm-3.7/build/share/llvm
+RUN ln -s /usr/share/llvm-3.7/cmake /usr/lib/llvm-3.7/build/share/llvm/cmake
 
 RUN mkdir /build
 WORKDIR /build