summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorBrian Coca <brian.coca+git@gmail.com>2017-01-20 05:09:55 +0100
committerBrian Coca <brian.coca+git@gmail.com>2017-01-20 05:09:55 +0100
commit0803c638bb8763ca2831bd7364106b08617f9cd2 (patch)
treee6fffdabe10fbda4b625244787899954ee7f57e0 /Makefile
parentfixed escape again (diff)
downloadansible-0803c638bb8763ca2831bd7364106b08617f9cd2.tar.xz
ansible-0803c638bb8763ca2831bd7364106b08617f9cd2.zip
set cpus only if not set already
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1294220eb8..357402deb6 100644
--- a/Makefile
+++ b/Makefile
@@ -48,10 +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}')
+CPUS ?= $(shell sysctl hw.ncpu|awk '{print $$2}')
else
DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M)
-CPUS := $(shell nproc)
+CPUS ?= $(shell nproc)
endif
# DEB build parameters