build-mingw-w64-libraries: Consistently use $MAKE
This was not converted in 5fe2e05419,
probably because those (automake based) makefiles work fine with
BSD make.
Use $MAKE here anyway, for consistency.
This commit is contained in:
1 parent
c608b57a2e
commit
eeb12404b5
1 file changed
+7
-2
@@ -50,6 +50,11 @@ if [ ! -d mingw-w64 ] || [ -n "$SYNC" ]; then
|
|||||||
CHECKOUT_ONLY=1 ./build-mingw-w64.sh
|
CHECKOUT_ONLY=1 ./build-mingw-w64.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
MAKE=make
|
||||||
|
if command -v gmake >/dev/null; then
|
||||||
|
MAKE=gmake
|
||||||
|
fi
|
||||||
|
|
||||||
cd mingw-w64/mingw-w64-libraries
|
cd mingw-w64/mingw-w64-libraries
|
||||||
for lib in winpthreads winstorecompat; do
|
for lib in winpthreads winstorecompat; do
|
||||||
cd $lib
|
cd $lib
|
||||||
@@ -61,8 +66,8 @@ for lib in winpthreads winstorecompat; do
|
|||||||
../configure --host=$arch-w64-mingw32 --prefix="$arch_prefix" --libdir="$arch_prefix/lib" \
|
../configure --host=$arch-w64-mingw32 --prefix="$arch_prefix" --libdir="$arch_prefix/lib" \
|
||||||
CFLAGS="$USE_CFLAGS" \
|
CFLAGS="$USE_CFLAGS" \
|
||||||
CXXFLAGS="$USE_CFLAGS"
|
CXXFLAGS="$USE_CFLAGS"
|
||||||
make -j$CORES
|
$MAKE -j$CORES
|
||||||
make install
|
$MAKE install
|
||||||
cd ..
|
cd ..
|
||||||
mkdir -p "$arch_prefix/share/mingw32"
|
mkdir -p "$arch_prefix/share/mingw32"
|
||||||
install -m644 COPYING "$arch_prefix/share/mingw32/COPYING.${lib}.txt"
|
install -m644 COPYING "$arch_prefix/share/mingw32/COPYING.${lib}.txt"
|
||||||
|
|||||||
Reference in new issue
Block a user