From 63e96035f90be32a2864b8837f588d98a315e839 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <harmenstoppels@gmail.com>
Date: Wed, 4 Dec 2019 08:21:09 +0100
Subject: [PATCH 1/3] Disable ccache in MXE

---
 common.windows | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common.windows b/common.windows
index 2ffc53b..795fc8e 100644
--- a/common.windows
+++ b/common.windows
@@ -87,6 +87,7 @@ RUN \
   #
   cd /usr/src/mxe && \
   echo "MXE_TARGETS := ${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}" > settings.mk && \
+  echo "MXE_USE_CCACHE :="                                                       >> settings.mk && \
   echo "LOCAL_PKG_LIST := cc cmake"                                              >> settings.mk && \
   echo ".DEFAULT local-pkg-list:"                                                >> settings.mk && \
   echo "local-pkg-list: \$(LOCAL_PKG_LIST)"                                      >> settings.mk && \

From 1717e81988bf146b1460539016d995f5ac784988 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <harmen.stoppels@medivation.ch>
Date: Tue, 3 Dec 2019 14:14:15 +0100
Subject: [PATCH 2/3] Build each package sequentially with all threads
 available

---
 common.windows | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.windows b/common.windows
index 795fc8e..c988003 100644
--- a/common.windows
+++ b/common.windows
@@ -95,7 +95,7 @@ RUN \
   # Build MXE
   #
   cd /usr/src/mxe && \
-  make -j$(nproc) && \
+  make JOBS=$(nproc) && \
   #
   # Cleanup: By keeping the MXE build system (Makefile, ...), derived images will be able to install
   #          additional packages.

From b7908a715abadca4447b4b46fd293c81d3357599 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <harmen.stoppels@medivation.ch>
Date: Tue, 3 Dec 2019 10:07:59 +0100
Subject: [PATCH 3/3] Bump MXE version

---
 common.windows | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.windows b/common.windows
index c988003..c488228 100644
--- a/common.windows
+++ b/common.windows
@@ -15,8 +15,8 @@
 #  ARG MXE_TARGET_LINK=shared
 #
 
-# mxe master 2019-02-27
-ARG MXE_GIT_TAG=2ce5587c94fc355b2c826c786a3ee018479d88d1
+# mxe master 2019-06-17
+ARG MXE_GIT_TAG=0567f17d34463abda1790957812c54e8c0cf59fe
 
 ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake