Skip to content

Commit 5fb13cf

Browse files
authored
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.
2 parents dc63b3a + d7a0440 commit 5fb13cf

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

src/etc/Dockerfile

-6
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,5 @@ RUN apt-get update && apt-get -y install \
2323
libedit-dev zlib1g-dev \
2424
llvm-3.7-tools cmake
2525

26-
# When we compile compiler-rt we pass it the llvm-config we just installed on
27-
# the system, but unfortunately it doesn't infer correctly where
28-
# LLVMConfig.cmake is so we need to coerce it a bit...
29-
RUN mkdir -p /usr/lib/llvm-3.7/build/share/llvm
30-
RUN ln -s /usr/share/llvm-3.7/cmake /usr/lib/llvm-3.7/build/share/llvm/cmake
31-
3226
RUN mkdir /build
3327
WORKDIR /build

0 commit comments

Comments
 (0)