[Bf-blender-cvs] [d09a372] master: Fix T48078: incorrect OS X command for retrieving number of CPUs on in Makefile.
Brecht Van Lommel
noreply at git.blender.org
Sat Apr 9 00:25:47 CEST 2016
Commit: d09a372acbfe5a8b93dde60b1ed3b8b2b548c82e
Author: Brecht Van Lommel
Date: Fri Apr 8 23:58:37 2016 +0200
Branches: master
https://developer.blender.org/rBd09a372acbfe5a8b93dde60b1ed3b8b2b548c82e
Fix T48078: incorrect OS X command for retrieving number of CPUs on in Makefile.
===================================================================
M GNUmakefile
===================================================================
diff --git a/GNUmakefile b/GNUmakefile
index 2732fdb..df2d705 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -87,13 +87,13 @@ ifndef NPROCS
NPROCS:=$(shell nproc)
endif
ifeq ($(OS), Darwin)
- NPROCS:=$(shell sysctl -a | grep "hw.ncpu" | cut -d" " -f3)
+ NPROCS:=$(shell sysctl -n hw.ncpu)
endif
ifeq ($(OS), FreeBSD)
- NPROCS:=$(shell sysctl -a | grep "hw.ncpu" | cut -d" " -f2 )
+ NPROCS:=$(shell sysctl -n hw.ncpu)
endif
ifeq ($(OS), NetBSD)
- NPROCS:=$(shell sysctl -a | grep "hw.ncpu" | cut -d" " -f2 )
+ NPROCS:=$(shell sysctl -n hw.ncpu)
endif
endif
More information about the Bf-blender-cvs
mailing list