diff options
| author | Seo Sanghyeon <sanxiyn@gmail.com> | 2016-08-02 00:12:41 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-02 00:12:41 +0900 |
| commit | 5fb13cf13fd76cc475816d12f729d4df7bd12f33 (patch) | |
| tree | 7bb4ba3a208f7508aad90fb516651b9b1e0582fb | |
| parent | dc63b3a04add20ae5d175fd6a7d6fac00aef8dd9 (diff) | |
| parent | d7a04403aed9d1e5d85b44fdd16bbfded2ebb5fe (diff) | |
| download | rust-5fb13cf13fd76cc475816d12f729d4df7bd12f33.tar.gz rust-5fb13cf13fd76cc475816d12f729d4df7bd12f33.zip | |
Rollup merge of #35157 - sanxiyn:remove-workaround, r=eddyb
Remove CMake workaround This isn't needed anymore as we aren't using CMake to build compiler-rt since #34873.
| -rw-r--r-- | src/etc/Dockerfile | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/etc/Dockerfile b/src/etc/Dockerfile index 94be84a3ebd..83d54789ff3 100644 --- a/src/etc/Dockerfile +++ b/src/etc/Dockerfile @@ -23,11 +23,5 @@ RUN apt-get update && apt-get -y install \ libedit-dev zlib1g-dev \ 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 |