arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed OS X cpu detection

pull/136/head
Jeffrey Walton 2016-01-22 17:18:50 -05:00
parent a7e08c7e84
commit df1f68da84
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cryptest.sh
View File

@ -187,7 +187,7 @@ CPU=1
MEM=1024 MEM=1024
if [ "$IS_DARWIN" -ne "0" ]; then if [ "$IS_DARWIN" -ne "0" ]; then
CPU=$(sysctl -a | grep 'hw.availcpu' | head -1 | awk '{print $2}') CPU=$(sysctl -a | grep 'hw.availcpu' | head -1 | awk '{print $3}')
MEM=$(sysctl -a | grep 'hw.memsize' | head -1 | awk '{print $3}') MEM=$(sysctl -a | grep 'hw.memsize' | head -1 | awk '{print $3}')
MEM=$(($MEM/1024)) MEM=$(($MEM/1024))
fi fi
@ -196,8 +196,11 @@ if [ "$IS_LINUX" -ne "0" ]; then
MEM=$(cat /proc/meminfo | grep "MemTotal" | awk '{print $2}') MEM=$(cat /proc/meminfo | grep "MemTotal" | awk '{print $2}')
fi fi
echo "CPU: $CPU"
echo "MEM: $MEM"
if [ "$CPU" -ge "2" ] && [ "$MEM" -ge "2097152" ]; then if [ "$CPU" -ge "2" ] && [ "$MEM" -ge "2097152" ]; then
MAKEARGS=(-j $CPU) MAKEARGS=(-j "$CPU")
fi fi
############################################ ############################################