From: Ed Kern <ejk@cisco.com>
Date: Wed, 22 Nov 2017 00:22:23 +0000 (-0700)
Subject:  Makefile: make_parallel_flags via env variable
X-Git-Tag: v18.04-rc0~195
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=62b29a242ce1c6edf08a78e43e027c763b7cf730;p=vpp.git

 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>
---

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 =					\