win32*.sh: Use nproc for CPU count when targeting win32

When building in chroot jail, /proc/cpuinfo may not be available. Switch to nproc which should be widely available, and does not rely on /proc/cpuinfo. Signed-off-by: Mike Latimer <[email protected]>
gsoneill · Dec 9, 2020 · 6c57f6b · 6c57f6b
1 parent 95ccc1c
commit 6c57f6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/win32_build.sh b/win32_build.sh
@@ -6,7 +6,7 @@ set -o pipefail
 SCRIPT_DIR="$(dirname "$BASH_SOURCE")"
 SCRIPT_DIR="$(realpath "$SCRIPT_DIR")"
 
-num_vcpus=$(( $(lscpu -p | tail -1 | cut -d "," -f 1) + 1 ))
+num_vcpus=$(nproc)
 
 CEPH_DIR="${CEPH_DIR:-$SCRIPT_DIR}"
 BUILD_DIR="${BUILD_DIR:-${CEPH_DIR}/build}"

diff --git a/win32_deps_build.sh b/win32_deps_build.sh
@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR="$(dirname "$BASH_SOURCE")"
 SCRIPT_DIR="$(realpath "$SCRIPT_DIR")"
 
-num_vcpus=$(( $(lscpu -p | tail -1 | cut -d "," -f 1) + 1 ))
+num_vcpus=$(nproc)
 NUM_WORKERS=${NUM_WORKERS:-$num_vcpus}
 
 DEPS_DIR="${DEPS_DIR:-$SCRIPT_DIR/build.deps}"