Check NPROCESSORS_ONLN in addition to _NPROCESSORS_ONLN

jedisct1 · Mar 7, 2018 · 7d4976a · 7d4976a
1 parent 816cef5
commit 7d4976a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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