From bcdc828e1c0224b5c5e787765a1a0b5ff1912331 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Mon, 20 Oct 2014 22:22:00 -0700 Subject: [PATCH] Fix display of "autodetected jobs" when $(JOBS) is set in settings.mk Signed-off-by: Timothy Gu --- Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 439459ee..8419626b 100644 --- a/Makefile +++ b/Makefile @@ -22,13 +22,6 @@ PKG_CDN := d1yihgixbnrglp.cloudfront.net PWD := $(shell pwd) SHELL := bash -NPROCS := $(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1) -JOBS_AUTO := $(shell printf "$(DEFAULT_MAX_JOBS)\n$(NPROCS)" | sort -n | head -1) -JOBS := $(strip $(if $(findstring undefined,$(origin JOBS)),\ - $(info [using autodetected $(JOBS_AUTO) job(s)]) \ - $(JOBS_AUTO)\ - ,\ - $(JOBS))) DATE := $(shell gdate --help >/dev/null 2>&1 && echo g)date INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install @@ -214,6 +207,14 @@ else } >'$(PWD)/settings.mk') endif +NPROCS := $(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1) +JOBS_AUTO := $(shell printf "$(DEFAULT_MAX_JOBS)\n$(NPROCS)" | sort -n | head -1) +JOBS := $(strip $(if $(findstring undefined,$(origin JOBS)),\ + $(info [using autodetected $(JOBS_AUTO) job(s)]) \ + $(JOBS_AUTO)\ + ,\ + $(JOBS))) + # cache some target string manipulation functions # `memoize` and `uc` from gmsl _CHOP_TARGET = $(call merge,.,$(call chop,$(call split,.,$(1))))