From 7d4976a304c777c2925f67a7df1a390ca8742f30 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 7 Mar 2018 10:14:01 +0100 Subject: [PATCH] Check NPROCESSORS_ONLN in addition to _NPROCESSORS_ONLN --- dist-build/android-build.sh | 2 +- dist-build/ios.sh | 2 +- dist-build/nativeclient-pnacl.sh | 2 +- dist-build/nativeclient-x86.sh | 2 +- dist-build/nativeclient-x86_64.sh | 2 +- dist-build/osx.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist-build/android-build.sh b/dist-build/android-build.sh index dedf9cd4..d98ddead 100755 --- a/dist-build/android-build.sh +++ b/dist-build/android-build.sh @@ -84,7 +84,7 @@ if [ "$NDK_PLATFORM" != "$NDK_PLATFORM_COMPAT" ]; then fi -NPROCESSORS=$(getconf _NPROCESSORS_ONLN 2>/dev/null) +NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) PROCESSORS=${NPROCESSORS:-3} make clean && \ diff --git a/dist-build/ios.sh b/dist-build/ios.sh index bff6c5f3..0575b090 100755 --- a/dist-build/ios.sh +++ b/dist-build/ios.sh @@ -45,7 +45,7 @@ fi --prefix="$SIMULATOR32_PREFIX" || exit 1 -NPROCESSORS=$(getconf _NPROCESSORS_ONLN 2>/dev/null) +NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) PROCESSORS=${NPROCESSORS:-3} make -j${PROCESSORS} install || exit 1 diff --git a/dist-build/nativeclient-pnacl.sh b/dist-build/nativeclient-pnacl.sh index 15db7716..020bb52c 100755 --- a/dist-build/nativeclient-pnacl.sh +++ b/dist-build/nativeclient-pnacl.sh @@ -31,7 +31,7 @@ fi --prefix="$PREFIX" || exit 1 -NPROCESSORS=$(getconf _NPROCESSORS_ONLN 2>/dev/null) +NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) PROCESSORS=${NPROCESSORS:-3} make -j${PROCESSORS} check && make -j${PROCESSORS} install || exit 1 diff --git a/dist-build/nativeclient-x86.sh b/dist-build/nativeclient-x86.sh index 4325815f..975add58 100755 --- a/dist-build/nativeclient-x86.sh +++ b/dist-build/nativeclient-x86.sh @@ -23,7 +23,7 @@ fi --disable-ssp --without-pthreads \ --prefix="$PREFIX" || exit 1 -NPROCESSORS=$(getconf _NPROCESSORS_ONLN 2>/dev/null) +NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) PROCESSORS=${NPROCESSORS:-3} make -j${PROCESSORS} check && make -j${PROCESSORS} install || exit 1 diff --git a/dist-build/nativeclient-x86_64.sh b/dist-build/nativeclient-x86_64.sh index 23e34f27..43a44c8e 100755 --- a/dist-build/nativeclient-x86_64.sh +++ b/dist-build/nativeclient-x86_64.sh @@ -23,7 +23,7 @@ fi --prefix="$PREFIX" || exit 1 -NPROCESSORS=$(getconf _NPROCESSORS_ONLN 2>/dev/null) +NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) PROCESSORS=${NPROCESSORS:-3} make -j${PROCESSORS} check && make -j${PROCESSORS} install || exit 1 diff --git a/dist-build/osx.sh b/dist-build/osx.sh index e29f9ff5..d47a0018 100755 --- a/dist-build/osx.sh +++ b/dist-build/osx.sh @@ -21,7 +21,7 @@ fi --prefix="$PREFIX" || exit 1 -NPROCESSORS=$(getconf _NPROCESSORS_ONLN 2>/dev/null) +NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) PROCESSORS=${NPROCESSORS:-3} make -j${PROCESSORS} check && make -j${PROCESSORS} install || exit 1