Split the non-dev version of Dockerfile into a few smaller steps

Now that we can build compiler-rt and libunwind with a stripped
llvm install, we can build things in a few smaller steps without
ending up with a larger docker image than before.
This commit is contained in:
Martin Storsjö committed 2018-08-03 14:47:33 +03:00
1 parent 0c85589b93
commit d6a9b3b9dc
1 file changed
+27 -4
+27 -4
View File
@@ -16,14 +16,37 @@ WORKDIR /build
ARG CORES=4 ARG CORES=4
ENV TOOLCHAIN_PREFIX=/opt/llvm-mingw ENV TOOLCHAIN_PREFIX=/opt/llvm-mingw
# Build and strip the LLVM installation
COPY build-llvm.sh strip-llvm.sh ./
RUN ./build-llvm.sh $TOOLCHAIN_PREFIX && \
./strip-llvm.sh $TOOLCHAIN_PREFIX && \
rm -rf /build
ENV TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64" ENV TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
# Build everything and clean up, in one step # Install the usual $TUPLE-clang binaries
COPY *.sh libssp-Makefile ./
COPY wrappers/*.sh ./wrappers/ COPY wrappers/*.sh ./wrappers/
COPY wrappers/*.c ./wrappers/ COPY wrappers/*.c ./wrappers/
RUN ./build-all.sh $TOOLCHAIN_PREFIX && \ COPY install-wrappers.sh .
./strip-llvm.sh $TOOLCHAIN_PREFIX && \ RUN ./install-wrappers.sh $TOOLCHAIN_PREFIX && \
rm -rf /build
# Build MinGW-w64, compiler-rt and mingw-w64's extra libraries
COPY build-mingw-w64.sh build-compiler-rt.sh build-mingw-w64-libraries.sh ./
RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX && \
./build-compiler-rt.sh $TOOLCHAIN_PREFIX && \
./build-mingw-w64-libraries.sh $TOOLCHAIN_PREFIX && \
rm -rf /build
# Build libunwind/libcxxabi/libcxx
COPY build-libcxx.sh merge-archives.sh ./
RUN ./build-libcxx.sh $TOOLCHAIN_PREFIX && \
rm -rf /build
# Build libssp
COPY build-libssp.sh libssp-Makefile ./
RUN ./build-libssp.sh $TOOLCHAIN_PREFIX && \
rm -rf /build rm -rf /build
# Cheating: Pull strip and objcopy from the normal binutils package. # Cheating: Pull strip and objcopy from the normal binutils package.