From b5ae2b5cc7d8f99d5d3915f519b883a56db8aaf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Wed, 13 Nov 2019 12:39:30 +0200
Subject: [PATCH] Allow overriding the default crt in dockerfiles with
 --build-arg DEFAULT_CRT=msvcrt

---
 Dockerfile     | 4 +++-
 Dockerfile.dev | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6d25aa2..a10d8a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,13 +17,15 @@ ENV TOOLCHAIN_PREFIX=/opt/llvm-mingw
 
 ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
 
+ARG DEFAULT_CRT=ucrt
+
 # 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 strip-llvm.sh install-wrappers.sh build-mingw-w64.sh build-compiler-rt.sh build-mingw-w64-libraries.sh build-libcxx.sh ./
 COPY wrappers/*.sh wrappers/*.c wrappers/*.h ./wrappers/
 RUN ./build-llvm.sh $TOOLCHAIN_PREFIX && \
     ./strip-llvm.sh $TOOLCHAIN_PREFIX && \
     ./install-wrappers.sh $TOOLCHAIN_PREFIX && \
-    ./build-mingw-w64.sh $TOOLCHAIN_PREFIX && \
+    ./build-mingw-w64.sh $TOOLCHAIN_PREFIX --with-default-msvcrt=$DEFAULT_CRT && \
     ./build-compiler-rt.sh $TOOLCHAIN_PREFIX && \
     ./build-mingw-w64-libraries.sh $TOOLCHAIN_PREFIX && \
     ./build-libcxx.sh $TOOLCHAIN_PREFIX && \
diff --git a/Dockerfile.dev b/Dockerfile.dev
index ffa91ac..baccb75 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -36,9 +36,11 @@ COPY wrappers/*.sh wrappers/*.c wrappers/*.h ./wrappers/
 COPY install-wrappers.sh ./
 RUN ./install-wrappers.sh $TOOLCHAIN_PREFIX
 
+ARG DEFAULT_CRT=ucrt
+
 # Build MinGW-w64
 COPY build-mingw-w64.sh ./
-RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX
+RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX --with-default-msvcrt=$DEFAULT_CRT
 
 # Build compiler-rt
 COPY build-compiler-rt.sh ./