diff options
| author | bors <bors@rust-lang.org> | 2016-06-23 23:33:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-23 23:33:32 -0700 |
| commit | 8c63d12dc3abc9ef16ca5ec3cf03f0dfbf09c3a5 (patch) | |
| tree | fdf593b51251d0349f4788d80b6a447685a1cc12 /src | |
| parent | 4d9faf363282e37b4da7dac01fe3c18f8f2025bf (diff) | |
| parent | 59db95b4999b878f99e682537cbb025ce7d07ec4 (diff) | |
| download | rust-8c63d12dc3abc9ef16ca5ec3cf03f0dfbf09c3a5.tar.gz rust-8c63d12dc3abc9ef16ca5ec3cf03f0dfbf09c3a5.zip | |
Auto merge of #34055 - brson:cmake, r=alexcrichton
Convert makefiles to build LLVM/compiler-rt with CMake This is certainly buggy, but I have successfully built on x86_64-unknown-linux-gnu and x86_64-pc-windows-gnu. I haven't built successfully on mac yet, and I've seen mysterious test failures on Linux, but I'm interested in throwing this at the bots to see what they think.
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 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 |