Skip to content

Commit ab2423b

Browse files
committed
build-mingw-w64-libraries: Consistently use $MAKE
This was not converted in 5fe2e05, probably because those (automake based) makefiles work fine with BSD make. Still consistently use $MAKE here too.
1 parent 334f715 commit ab2423b

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

build-mingw-w64-libraries.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ if [ ! -d mingw-w64 ] || [ -n "$SYNC" ]; then
5050
CHECKOUT_ONLY=1 ./build-mingw-w64.sh
5151
fi
5252

53+
MAKE=make
54+
if command -v gmake >/dev/null; then
55+
MAKE=gmake
56+
fi
57+
5358
cd mingw-w64/mingw-w64-libraries
5459
for lib in winpthreads winstorecompat; do
5560
cd $lib
@@ -61,8 +66,8 @@ for lib in winpthreads winstorecompat; do
6166
../configure --host=$arch-w64-mingw32 --prefix="$arch_prefix" --libdir="$arch_prefix/lib" \
6267
CFLAGS="$USE_CFLAGS" \
6368
CXXFLAGS="$USE_CFLAGS"
64-
make -j$CORES
65-
make install
69+
$MAKE -j$CORES
70+
$MAKE install
6671
cd ..
6772
mkdir -p "$arch_prefix/share/mingw32"
6873
install -m644 COPYING "$arch_prefix/share/mingw32/COPYING.${lib}.txt"

0 commit comments

Comments
 (0)