From 64363c14db5dbe564233c6bcf929c7442533f1c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Sun, 7 Dec 2025 00:48:03 +0200
Subject: [PATCH] build-busybox: Disable make, copy mingw32-make.exe as
 make.exe

The built-in make is a POSIX make tool, which doesn't support
GNU make features.

As we do have GNU make, insert that as "make.exe" in the busybox
directory. Don't do that in the main llvm-mingw bin directory,
which can be used with other environments (e.g. msys2), where the
native make is to be preferred.
---
 Dockerfile.cross     | 5 ++++-
 build-busybox.sh     | 1 +
 build-cross-tools.sh | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.cross b/Dockerfile.cross
index 6c53524..9ac37df 100644
--- a/Dockerfile.cross
+++ b/Dockerfile.cross
@@ -68,7 +68,10 @@ ARG WITH_BUSYBOX
 
 COPY build-busybox.sh .
 RUN if [ -n "$WITH_BUSYBOX" ]; then \
-        ./build-busybox.sh $CROSS_TOOLCHAIN_PREFIX/busybox --host=$HOST; \
+        ./build-busybox.sh $CROSS_TOOLCHAIN_PREFIX/busybox --host=$HOST && \
+        cp $CROSS_TOOLCHAIN_PREFIX/bin/mingw32-make.exe $CROSS_TOOLCHAIN_PREFIX/busybox/bin/make.exe && \
+        mkdir -p $CROSS_TOOLCHAIN_PREFIX/busybox/share && \
+        cp -a $CROSS_TOOLCHAIN_PREFIX/share/make $CROSS_TOOLCHAIN_PREFIX/busybox/share; \
     fi
 
 ARG TAG
diff --git a/build-busybox.sh b/build-busybox.sh
index c0046dc..3c842c9 100755
--- a/build-busybox.sh
+++ b/build-busybox.sh
@@ -74,6 +74,7 @@ make mingw64a_defconfig O=$BUILDDIR -j$CORES
 cd $BUILDDIR
 sed -ri 's/^(CONFIG_AR)=y/\1=n/' .config
 sed -ri 's/^(CONFIG_FEATURE_FAIL_IF_UTF8_MANIFEST_UNSUPPORTED)=y/\1=n/' .config
+sed -ri 's/^(CONFIG_MAKE)=y/\1=n/' .config
 $MAKE -j$CORES CROSS_COMPILE=${HOST+$HOST-}
 cp ../LICENSE $PREFIX/LICENSE.txt
 mkdir -p $PREFIX/bin
diff --git a/build-cross-tools.sh b/build-cross-tools.sh
index 5f87e49..8644b00 100755
--- a/build-cross-tools.sh
+++ b/build-cross-tools.sh
@@ -108,4 +108,9 @@ if [ -z "$NO_MAKE" ]; then
 fi
 if [ -n "$BUSYBOX" ]; then
     ./build-busybox.sh $PREFIX/busybox --host=$HOST
+    if [ -z "$NO_MAKE" ]; then
+        cp $PREFIX/bin/mingw32-make.exe $PREFIX/busybox/bin/make.exe
+        mkdir -p $PREFIX/busybox/share
+        cp -a $PREFIX/share/make $PREFIX/busybox/share
+    fi
 fi