WIP: docker: Reduce the amount of work to do, for a faster test build

mstorsjo · Feb 20, 2024 · 9ce2b36 · 9ce2b36
1 parent 2fccf75
commit 9ce2b36
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,7 @@ WORKDIR /build
 
 ENV TOOLCHAIN_PREFIX=/opt/llvm-mingw
 
-ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
+ARG TOOLCHAIN_ARCHS="x86_64"
 
 ARG DEFAULT_CRT=ucrt
 
@@ -25,7 +25,7 @@ ARG CFGUARD_ARGS=--enable-cfguard
 # Build everything that uses the llvm monorepo. We need to build the mingw runtime before the compiler-rt/libunwind/libcxxabi/libcxx runtimes.
 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 ./
 COPY wrappers/*.sh wrappers/*.c wrappers/*.h ./wrappers/
-RUN ./build-llvm.sh $TOOLCHAIN_PREFIX && \
+RUN ./build-llvm.sh $TOOLCHAIN_PREFIX --disable-lldb --disable-clang-tools-extra && \
     ./build-lldb-mi.sh $TOOLCHAIN_PREFIX && \
     ./strip-llvm.sh $TOOLCHAIN_PREFIX && \
     ./install-wrappers.sh $TOOLCHAIN_PREFIX && \

diff --git a/Dockerfile.cross b/Dockerfile.cross
@@ -41,15 +41,15 @@ ARG FULL_LLVM
 
 COPY build-llvm.sh .
 RUN if [ -n "$WITH_PYTHON" ]; then ARG="--with-python"; fi && \
-    ./build-llvm.sh $CROSS_TOOLCHAIN_PREFIX --host=$HOST $ARG
+    ./build-llvm.sh $CROSS_TOOLCHAIN_PREFIX --host=$HOST $ARG --disable-clang-tools-extra
 
 COPY build-lldb-mi.sh .
 RUN ./build-lldb-mi.sh $CROSS_TOOLCHAIN_PREFIX --host=$HOST
 
 COPY strip-llvm.sh .
 RUN ./strip-llvm.sh $CROSS_TOOLCHAIN_PREFIX --host=$HOST
 
-ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
+ARG TOOLCHAIN_ARCHS="x86_64"
 
 COPY build-mingw-w64.sh build-mingw-w64-tools.sh ./
 RUN ./build-mingw-w64-tools.sh $CROSS_TOOLCHAIN_PREFIX --skip-include-triplet-prefix --host=$HOST

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -20,7 +20,7 @@ ARG FULL_LLVM
 
 # Build LLVM
 COPY build-llvm.sh ./
-RUN ./build-llvm.sh $TOOLCHAIN_PREFIX
+RUN ./build-llvm.sh $TOOLCHAIN_PREFIX --disable-lldb --disable-clang-tools-extra
 
 # Build LLDB-MI
 COPY build-lldb-mi.sh ./
@@ -34,7 +34,7 @@ RUN ./build-lldb-mi.sh $TOOLCHAIN_PREFIX
 COPY strip-llvm.sh ./
 RUN ./strip-llvm.sh $TOOLCHAIN_PREFIX
 
-ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
+ARG TOOLCHAIN_ARCHS="x86_64"
 
 # Install the usual $TUPLE-clang binaries
 COPY wrappers/*.sh wrappers/*.c wrappers/*.h ./wrappers/