1 files changed, 16 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index 642f5ca..e4da0b7 100755
--- a/build.sh
+++ b/build.sh
@@ -43,10 +43,23 @@ NODE=${NODE-${NISSY_BUILD_NODE:-"node"}}
 # The default value is 16.
 THREADS=${THREADS-${NISSY_BUILD_THREADS}}
+portable_nproc() {
+        OS="$(uname -s)"
+        case "$OS" in
+        "Linux")
+                nproc
+                ;;
+        "Darwin" | "*BSD")
+                sysctl -n hw.ncpu
+                ;;
+        *)
+                echo "32" # A safe, large default
+                ;;
+        esac
+}
 detectthreads() {
-        # TODO: detect based on system
+        echo "$(portable_nproc)"
-        # Is 'getconf NPROCESSORD_ONLN' portable? Is it threads or cores?
-        echo "16"
 }
 [ -z "$THREADS" ] && THREADS="$(detectthreads)"

diff --git a/build.sh b/build.sh index 642f5ca..e4da0b7 100755 --- a/build.sh +++ b/build.sh
@@ -43,10 +43,23 @@ NODE=${NODE-${NISSY_BUILD_NODE:-"node"}}
43	# The default value is 16.	43	# The default value is 16.
44	THREADS=${THREADS-${NISSY_BUILD_THREADS}}	44	THREADS=${THREADS-${NISSY_BUILD_THREADS}}
45		45
		46	portable_nproc() {
		47	OS="$(uname -s)"
		48	case "$OS" in
		49	"Linux")
		50	nproc
		51	;;
		52	"Darwin" \| "*BSD")
		53	sysctl -n hw.ncpu
		54	;;
		55	*)
		56	echo "32" # A safe, large default
		57	;;
		58	esac
		59	}
		60
46	detectthreads() {	61	detectthreads() {
47	# TODO: detect based on system	62	echo "$(portable_nproc)"
48	# Is 'getconf NPROCESSORD_ONLN' portable? Is it threads or cores?
49	echo "16"
50	}	63	}
51		64
52	[ -z "$THREADS" ] && THREADS="$(detectthreads)"	65	[ -z "$THREADS" ] && THREADS="$(detectthreads)"