Skip to content

Commit

Permalink
Rollup merge of rust-lang#35157 - sanxiyn:remove-workaround, r=eddyb
Browse files Browse the repository at this point in the history
Remove CMake workaround

This isn't needed anymore as we aren't using CMake to build compiler-rt since rust-lang#34873.
  • Loading branch information
sanxiyn authored Aug 1, 2016
2 parents dc63b3a + d7a0440 commit 5fb13cf
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/etc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5fb13cf

Please sign in to comment.