From eeb12404b50ea7b2e3acd6bb24652a2c593cd4ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 3 Apr 2025 10:09:38 +0300 Subject: [PATCH] build-mingw-w64-libraries: Consistently use $MAKE This was not converted in 5fe2e05419c2af704f2e936ec752f02bdbcf097d, probably because those (automake based) makefiles work fine with BSD make. Use $MAKE here anyway, for consistency. --- build-mingw-w64-libraries.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build-mingw-w64-libraries.sh b/build-mingw-w64-libraries.sh index 7549be4..ccbda60 100755 --- a/build-mingw-w64-libraries.sh +++ b/build-mingw-w64-libraries.sh @@ -50,6 +50,11 @@ if [ ! -d mingw-w64 ] || [ -n "$SYNC" ]; then CHECKOUT_ONLY=1 ./build-mingw-w64.sh fi +MAKE=make +if command -v gmake >/dev/null; then + MAKE=gmake +fi + cd mingw-w64/mingw-w64-libraries for lib in winpthreads winstorecompat; do cd $lib @@ -61,8 +66,8 @@ for lib in winpthreads winstorecompat; do ../configure --host=$arch-w64-mingw32 --prefix="$arch_prefix" --libdir="$arch_prefix/lib" \ CFLAGS="$USE_CFLAGS" \ CXXFLAGS="$USE_CFLAGS" - make -j$CORES - make install + $MAKE -j$CORES + $MAKE install cd .. mkdir -p "$arch_prefix/share/mingw32" install -m644 COPYING "$arch_prefix/share/mingw32/COPYING.${lib}.txt"