aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Kern <ejk@cisco.com>2017-11-21 17:22:23 -0700
committerDamjan Marion <dmarion.lists@gmail.com>2017-11-22 20:19:00 +0000
commit62b29a242ce1c6edf08a78e43e027c763b7cf730 (patch)
tree240466a58bfaa71f79992596efe9cdbc1565d8d8
parentd010086a3e961cb01f2ffcf13d826ffff40fedb1 (diff)
Makefile: make_parallel_flags via env variable
/proc/cpuinfo with container builds may lead to jenkins failures ability to pass in MAKE_PARALLEL_FLAGS via env directly for container builds Change-Id: Id02acb542d5ffbe3f4dec7712ae2cb07512b236d Signed-off-by: Ed Kern <ejk@cisco.com>
-rw-r--r--build-root/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/build-root/Makefile b/build-root/Makefile
index dd24b4c6583..d491e71feca 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -645,7 +645,7 @@ configure_check_timestamp = \
# for file presence and content; for now this will have to do.
MAKE_PARALLEL_JOBS = -j $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo), \
$(shell grep -c ^processor /proc/cpuinfo), 2)
-MAKE_PARALLEL_FLAGS = $(if $($(PACKAGE)_make_parallel_fails),,$(MAKE_PARALLEL_JOBS))
+MAKE_PARALLEL_FLAGS ?= $(if $($(PACKAGE)_make_parallel_fails),,$(MAKE_PARALLEL_JOBS))
# Make command shorthand for packages & tools.
PACKAGE_MAKE = \