X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=dpdk%2FMakefile;h=06ba1270ed1fb36e7911a23d95afd8ab4b9c02aa;hb=b2861e8fb6855e9924887e5743d65ebbfbc6d7d2;hp=d781ed5db40587244717cb39525c7faf08c80467;hpb=9f5a2b6310ce5c8e59c32ca6f27d8a187b0e4346;p=vpp.git

diff --git a/dpdk/Makefile b/dpdk/Makefile
index d781ed5db40..06ba1270ed1 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -77,7 +77,13 @@ else
 $(error unknown platform)
 endif
 
-JOBS := $(shell grep processor /proc/cpuinfo | wc -l)
+# /proc/cpuinfo does not exist on platforms without a /proc and on some
+# platforms, notably inside containers, it has no content. In those cases
+# we assume there's 1 processor; we use 2*ncpu for the -j option.
+# 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.
+JOBS := $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo),\
+	$(shell expr 2 '*' $$(grep -c ^processor /proc/cpuinfo)), 2)
 
 # compiler/linker custom arguments
 DPDK_CPU_CFLAGS := -pie -fPIC