From ea061d65c906b2bd1c464ff7ec0fc5d9ac31979a Mon Sep 17 00:00:00 2001 From: David Given Date: Tue, 19 Aug 2025 01:14:33 +0200 Subject: [PATCH 1/2] Update ab. --- build/ab.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build/ab.mk b/build/ab.mk index 4226f069..e490ecc7 100644 --- a/build/ab.mk +++ b/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 From 3b60cdc70786f7de04e8f13bdb94a0fbc93228b5 Mon Sep 17 00:00:00 2001 From: David Given Date: Tue, 19 Aug 2025 01:15:47 +0200 Subject: [PATCH 2/2] Remove the -j from the build scripts for OSX. --- .github/workflows/ccpp.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index aa521bac..9558e72b 100644 --- a/.github/workflows/ccpp.yml +++ b/.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: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 40b45091..d234f4de 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -97,7 +97,7 @@ jobs: - name: make run: | - gmake -j2 + gmake mv FluxEngine.pkg FluxEngine-${{ runner.arch }}.pkg - name: tag