flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Choose # of threads based on system info (#3644)

This commit is contained in:
Bond-009 2017-06-16 14:06:48 +02:00 committed by Lukas Pioch
parent 705132011a
commit 49e015b8de
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compile.sh
View File

@ -56,7 +56,7 @@ errorArguments ()
echo "options:"
echo " -m The compilation mode. Either \"Release\" or \"Debug\". Defaults to \"$DEFAULT_BUILDTYPE\""
echo ' -t The number of threads to use for compiling'
echo ' If unspecified, a "smart guess" is attempted (Currently simply picks 2)'
echo ' If unspecified, a "smart guess" is attempted'
echo ' -b The branch to compile. (Currently unused and pinned to MASTER)'
echo ' -n Prevent interactive mode'
echo ' -d Dry run. Print the chosen settings and exit'
@ -361,7 +361,13 @@ fi
autoChooseThreads()
{
echo "$DEFAULT_THREADS" # Todo choose based on system info, and fallback to DEFAULT_THREADS.
KERNEL=$(uname -s)
if [ "$KERNEL" = "Linux" ] || [ "$KERNEL" = "Darwin" ]; then
echo $(getconf _NPROCESSORS_ONLN)
else
echo "$DEFAULT_THREADS"
fi
}
if [ $STATE_INTERACTIVE -eq 1 ]; then