[Bf-blender-cvs] [05be2a8c454] master: Cleanup: de-duplicate makefile OS checks

Campbell Barton noreply at git.blender.org
Thu Aug 10 14:37:07 CEST 2017


Commit: 05be2a8c454f25f9b1ae425d51a846b408f116b7
Author: Campbell Barton
Date:   Thu Aug 10 22:36:47 2017 +1000
Branches: master
https://developer.blender.org/rB05be2a8c454f25f9b1ae425d51a846b408f116b7

Cleanup: de-duplicate makefile OS checks

===================================================================

M	GNUmakefile

===================================================================

diff --git a/GNUmakefile b/GNUmakefile
index 9661f292699..d1e575cfc3c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -91,13 +91,7 @@ ifndef NPROCS
 	ifeq ($(OS), Linux)
 		NPROCS:=$(shell nproc)
 	endif
-	ifeq ($(OS), Darwin)
-		NPROCS:=$(shell sysctl -n hw.ncpu)
-	endif
-	ifeq ($(OS), FreeBSD)
-		NPROCS:=$(shell sysctl -n hw.ncpu)
-	endif
-	ifeq ($(OS), NetBSD)
+	ifneq (,$(filter $(OS),Darwin FreeBSD NetBSD))
 		NPROCS:=$(shell sysctl -n hw.ncpu)
 	endif
 endif




More information about the Bf-blender-cvs mailing list