Merge from master.

.github/workflows/ccpp.yml

@@ -65,7 +65,7 @@ jobs:
       run: |
         brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg
     - name: make
-      run: gmake -C fluxengine -j2
+      run: gmake -C fluxengine
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:

.github/workflows/release.yml

@@ -97,7 +97,7 @@ jobs:
 
     - name: make
       run: |
-        gmake -j2
+        gmake
         mv FluxEngine.pkg FluxEngine-${{ runner.arch }}.pkg
 
     - name: tag

build/ab.mk

@@ -87,7 +87,12 @@ $(PKG_CONFIG_HASHES) $(HOST_PKG_CONFIG_HASHES) &:
 
 include $(OBJ)/build.mk
 
-MAKEFLAGS += -r -j$(shell nproc)
+ifeq ($(OSX),yes)
+	MAKEFLAGS += -r -j$(shell sysctl -n hw.logicalcpu)
+else
+	MAKEFLAGS += -r -j$(shell nproc)
+endif
+
 .DELETE_ON_ERROR:
 
 .PHONY: update-ab