From 6b70d5f03b688ee24df38ea669c0d800a6ad3b49 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 18 Sep 2023 10:15:10 +0000 Subject: drop GNU nproc(1) support in favor of getconf(1) `getconf NPROCESSORS_ONLN' will succeed on GNU/Linux systems anyways; and the non-underscore-prefixed invocation works fine on all BSD flavors tested. Thus the `nproc' and `gnproc' attempts will never be reached. The only downside is we lose the ability to account for CPU affinity, but that's probably not an issue since CPU affinity (AFAIK) isn't a commonly-used feature. --- ci/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/run.sh b/ci/run.sh index 93790269..bd1d8a4d 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -12,7 +12,7 @@ then $DO $MAKE clean >/dev/null fi NPROC=${NPROC-$({ getconf _NPROCESSORS_ONLN || getconf NPROCESSORS_ONLN || - gnproc || nproc || echo 2; } 2>/dev/null)} + echo 2; } 2>/dev/null)} TEST_JOBS=${TEST_JOBS-1} $PERL -w ci/profiles.perl | while read args -- cgit v1.2.3-24-ge0c7