Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLawrence D'Oliveiro <from-blender@geek-central.gen.nz>2014-03-02 13:28:42 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-03-02 13:29:40 +0400
commit49e21f697840f8ab12b1d2c7e8be51b055bcbce3 (patch)
treef2524e0ca1585b053c1e966ee9ce74893df30ea9 /GNUmakefile
parent6045de2bf5a13066d10148ae558071f474aaf6ee (diff)
Found another place where nproc can be used
/proc/cpuinfo is a Linux-specific thing. Using GNU [[ http://www.gnu.org/software/coreutils/manual/html_node/nproc-invocation.html | nproc ]] should be more portable. Reviewers: mont29 Reviewed By: mont29 Differential Revision: https://developer.blender.org/D377
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 8ae2efbe53c..566a44b500f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -74,7 +74,7 @@ endif
# Get the number of cores for threaded build
NPROCS:=1
ifeq ($(OS), Linux)
- NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
+ NPROCS:=$(shell nproc)
endif
ifeq ($(OS), Darwin)
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3)