aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Yourtchenko <ayourtch@gmail.com>2020-02-07 12:58:00 +0100
committerDave Wallace <dwallacelf@gmail.com>2020-06-29 13:30:00 +0000
commite88582facad678701457fa68cbe4ed24f6ec4266 (patch)
tree619475f6c05537de3be66ea35d1d11d17ad89484
parent8f2ac2b649d30a118c175a5e491136dbffc03abe (diff)
misc: fix the MAKE_PARALLEL_JOBS for 'make verify' targetstable/1904
MAKE_PARALLEL_JOBS was prepending "-j", which in case of nested targets like "verify" resulted in ninja being executed with "-j -j" flags. Solution: prepend -j only at the moment of setting the MAKE_PARALLEL_FLAGS variable, this keeps MAKE_PARALLEL_JOBS intact regardless of depth of the job call tree. Type: make Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com> Change-Id: I10a69fe527758e5a862852a9f2102aeaca30e88f (cherry picked from commit 56ac770df97065ea705ff2f3070055a410113b9f)
-rw-r--r--build-root/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/build-root/Makefile b/build-root/Makefile
index d810abb..4a675d6 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -653,12 +653,10 @@ configure_check_timestamp = \
# NB: GNU Make 4.2 will let us use '$(file </proc/cpuinfo)' to both test
# for file presence and content; for now this will have to do.
ifndef MAKE_PARALLEL_JOBS
-MAKE_PARALLEL_JOBS = -j $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo), \
+MAKE_PARALLEL_JOBS = $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo), \
$(shell grep -c ^processor /proc/cpuinfo), 2)
-else
-MAKE_PARALLEL_JOBS := -j $(MAKE_PARALLEL_JOBS)
endif
-MAKE_PARALLEL_FLAGS ?= $(if $($(PACKAGE)_make_parallel_fails),,$(MAKE_PARALLEL_JOBS))
+MAKE_PARALLEL_FLAGS ?= $(if $($(PACKAGE)_make_parallel_fails),,-j $(MAKE_PARALLEL_JOBS))
# Make command shorthand for packages & tools.
PACKAGE_MAKE = \