diff options
| author | Brian Anderson <banderson@mozilla.com> | 2016-06-02 00:41:27 +0000 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-06-21 19:54:28 -0700 |
| commit | 59db95b4999b878f99e682537cbb025ce7d07ec4 (patch) | |
| tree | 9e814881750ef57a34e455c8e4c1ae6200d44a42 /src | |
| parent | fe96928d7de991e527a7ed7b88bb30aa965c8a08 (diff) | |
Convert makefiles to build LLVM/compiler-rt with CMake
Diffstat (limited to 'src')
| m--------- | src/compiler-rt | 0 | ||||
| -rw-r--r-- | src/etc/Dockerfile | 8 |
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 58fa1474444..31de2ae8948 100644 --- a/src/etc/Dockerfile +++ b/src/etc/Dockerfile @@ -19,7 +19,13 @@ FROM ubuntu:xenial RUN apt-get update && apt-get -y install \ curl g++ 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 |