summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-04-28 17:31:16 +0100
committerLeah Rowe <leah@libreboot.org>2024-04-28 17:31:16 +0100
commit55204dc4449456c6a11ed19f530b7673143450a5 (patch)
tree7ab74a073ef5936a4d75ad668e1c617e70457f6e
parent71f8e6530a9c33748a26a2c4f68f84a3ec6badbd (diff)
option.sh: don't use nproc (not portable)
export LBMK_THREADS=x where x is an integer. this is already supported for setting the number of build threads, but if not set it uses nproc. openbsd doesn't have nproc. default to 1 thread. now you MUST set threads. e.g. in linux do: export LBMK_THREADS=$(nproc) preliminary work is being done to make lbmk run on openbsd! Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xinclude/option.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/option.sh b/include/option.sh
index 8fc80aaa..eb792775 100755
--- a/include/option.sh
+++ b/include/option.sh
@@ -23,13 +23,14 @@ eval "$(setvars "" CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \
CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE)"
threads=
-set | grep LBMK_THREADS 1>/dev/null 2>/dev/null || threads=$(nproc) || :
-[ -z "$threads" ] && threads=$LBMK_THREADS
-[ -z "$threads" ] && threads=1 # LBMK_THREADS not set, and nproc failed
+set | grep LBMK_THREADS 1>/dev/null 2>/dev/null && threads="$LBMK_THREADS"
+[ -z "$threads" ] && threads=1
expr "X$threads" : "X-\{0,1\}[0123456789][0123456789]*$" \
1>/dev/null 2>/dev/null || threads=1 # user specified a non-integer
+export LBMK_THREADS="$threads"
+
items()
{
rval=1