From: Jens Steube <jens.steube@gmail.com>
Date: Sun, 6 Dec 2015 12:09:17 +0000 (+0100)
Subject: Revert "Remove NPROCS from Makefile, make is able to automatically detect the optimal... 
X-Git-Tag: v3.00-beta~605
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=ab66fa17728b85968dc6b5d590600e56aeed66dd;p=hashcat.git

Revert "Remove NPROCS from Makefile, make is able to automatically detect the optimal number of parallel threads"

Problem here is; This process requires alot of memory. If host memory is too small it will segfault somewhere inside AMD's OpenCL runtime library. Therefore it's better to stick to NPROCS as part of a workaround.

This reverts commit e5adccbf3804d58cb4beb8f06797c0ba179043c6.
---

diff --git a/src/Makefile b/src/Makefile
index 47a396b..2e06169 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,16 +4,17 @@
 ##
 
 ##
-## Detect host OS
+## Detect number of processors
 ##
 
+NPROCS   := $(shell grep -c ^processor /proc/cpuinfo)
 OS       := $(shell uname)
 
 ##
 ## Makefile flags
 ##
 
-MAKEFLAGS += -l -j -rR --no-print-directory
+MAKEFLAGS += -l -j $(NPROCS) -rR --no-print-directory
 
 ifneq ($(findstring clean,$(MAKECMDGOALS)),)
 MAKEFLAGS += -j 1