From 622ce2cc9d3f1894cef9dc762409885a278c314f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Thu, 7 Dec 2023 09:13:21 +0100 Subject: [PATCH] Detect JOBS in a more portable way --- .github/workflows/ci.yml | 14 ++++++-------- Makefile | 11 ++++++++++- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf0952e..e7e13e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -385,11 +385,10 @@ jobs: with: usesh: true prepare: | - pkg_add cmake + pkg_add cmake gmake run: | - cmake -B build - cmake --build build -j $(sysctl -n hw.ncpu) - ./build/qjs -qd + gmake + gmake stats freebsd: runs-on: ubuntu-latest @@ -400,8 +399,7 @@ jobs: with: usesh: true prepare: | - pkg install -y cmake + pkg install -y cmake gmake run: | - cmake -B build - cmake --build build -j $(sysctl -n hw.ncpu) - ./build/qjs -qd + gmake + gmake stats diff --git a/Makefile b/Makefile index d2d2354..8cfc758 100644 --- a/Makefile +++ b/Makefile @@ -26,11 +26,20 @@ BUILD_DIR=build BUILD_TYPE?=Release -JOBS?=$(shell getconf _NPROCESSORS_ONLN) QJS=$(BUILD_DIR)/qjs RUN262=$(BUILD_DIR)/run-test262 +JOBS?=$(shell getconf _NPROCESSORS_ONLN) +ifeq ($(JOBS),) +JOBS := $(shell sysctl -n hw.ncpu) +endif +ifeq ($(JOBS),) +JOBS := $(shell nproc) +endif +ifeq ($(JOBS),) +JOBS := 4 +endif all: $(QJS)