Skip to content

Commit 80f62b4

Browse files
committed
dockerfile: Switch to using build-all.sh
Since 0f9d9f1, when switching to the llvm-project git monorepo (rather than individual git repos for llvm, clang, libcxx etc), there's little point in calling all the individual build scripts separately. The comment about the order of building things and what uses the monorepo is less relevant on its own now; it was more relevant in context of the change from before in that commit.
1 parent d3e8d58 commit 80f62b4

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

Dockerfile

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,9 @@ ARG DEFAULT_CRT=ucrt
2222

2323
ARG CFGUARD_ARGS=--enable-cfguard
2424

25-
# Build everything that uses the llvm monorepo. We need to build the mingw runtime before the compiler-rt/libunwind/libcxxabi/libcxx runtimes.
26-
COPY build-llvm.sh build-lldb-mi.sh strip-llvm.sh install-wrappers.sh build-mingw-w64.sh build-mingw-w64-tools.sh build-compiler-rt.sh build-libcxx.sh build-mingw-w64-libraries.sh build-openmp.sh ./
25+
COPY build-all.sh build-llvm.sh build-lldb-mi.sh strip-llvm.sh install-wrappers.sh build-mingw-w64.sh build-mingw-w64-tools.sh build-compiler-rt.sh build-libcxx.sh build-mingw-w64-libraries.sh build-openmp.sh ./
2726
COPY wrappers/*.sh wrappers/*.c wrappers/*.h wrappers/*.cfg ./wrappers/
28-
RUN ./build-llvm.sh $TOOLCHAIN_PREFIX && \
29-
./build-lldb-mi.sh $TOOLCHAIN_PREFIX && \
30-
./strip-llvm.sh $TOOLCHAIN_PREFIX && \
31-
./install-wrappers.sh $TOOLCHAIN_PREFIX && \
32-
./build-mingw-w64.sh $TOOLCHAIN_PREFIX --with-default-msvcrt=$DEFAULT_CRT $CFGUARD_ARGS && \
33-
./build-mingw-w64-tools.sh $TOOLCHAIN_PREFIX && \
34-
./build-compiler-rt.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS && \
35-
./build-libcxx.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS && \
36-
./build-mingw-w64-libraries.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS && \
37-
./build-compiler-rt.sh $TOOLCHAIN_PREFIX --build-sanitizers && \
38-
./build-openmp.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS && \
27+
RUN ./build-all.sh $TOOLCHAIN_PREFIX --with-default-msvcrt=$DEFAULT_CRT $CFGUARD_ARGS && \
3928
rm -rf /build/*
4029

4130
ENV PATH=$TOOLCHAIN_PREFIX/bin:$PATH

0 commit comments

Comments
 (0)