summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorBrian Coca <brian.coca+git@gmail.com>2017-01-09 21:44:37 +0100
committerBrian Coca <brian.coca+git@gmail.com>2017-01-09 21:44:53 +0100
commitafbe3bd63f9e347d418643953e8a1c82f625877d (patch)
tree8aa0c2dbdb29a4b8d210265fcde5f34c0649f672 /Makefile
parentFix a test failure on Python 3.6 (#20030) (diff)
downloadansible-afbe3bd63f9e347d418643953e8a1c82f625877d.tar.xz
ansible-afbe3bd63f9e347d418643953e8a1c82f625877d.zip
corrected service condition
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 57a9eb2de3..154b8d3eb4 100644
--- a/Makefile
+++ b/Makefile
@@ -48,8 +48,10 @@ endif
ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD|DragonFly'),1)
DATE := $(shell date -j -r $(shell git log -n 1 --format="%at") +%Y%m%d%H%M)
+CPUS := $(shell sysctl hw.ncpu|awk '{print $2}')
else
DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M)
+CPUS := $(shell nproc)
endif
# DEB build parameters