[buildsteps][windows] correct evaluation of make jobs

tadly · Apr 25, 2017 · dc04338 · dc04338
1 parent 8056f35
commit dc04338
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -363,10 +363,6 @@ lib/cpluff/stamp-h1
 /tools/TexturePacker/Makefile
 /tools/TexturePacker/*.dll
 
-# /tools/buildsteps/win32
-/tools/buildsteps/win32/1
-/tools/buildsteps/win32/4
-
 # /userdata/
 /userdata/Database
 /userdata/playlists

diff --git a/tools/buildsteps/win32/buildhelpers.sh b/tools/buildsteps/win32/buildhelpers.sh
@@ -5,9 +5,9 @@ BGPROCESSFILE="$2"
 tools="$3"
 
 cpuCount=1
-if [ $NUMBER_OF_PROCESSORS > 1 ]; then
-  if [ $NUMBER_OF_PROCESSORS > 4 ]; then
-    cpuCount=6
+if [[ $NUMBER_OF_PROCESSORS > 1 ]]; then
+  if [[ $NUMBER_OF_PROCESSORS > 4 ]]; then
+    cpuCount=$NUMBER_OF_PROCESSORS
   else
     cpuCount=`expr $NUMBER_OF_PROCESSORS + $NUMBER_OF_PROCESSORS / 2`
   fi

diff --git a/tools/buildsteps/win32/make-mingwlibs.sh b/tools/buildsteps/win32/make-mingwlibs.sh
@@ -141,10 +141,6 @@ else
   MAKECLEAN="noclean"
 fi
 
-if [ $NUMBER_OF_PROCESSORS > 1 ]; then
-  MAKEFLAGS=-j`expr $NUMBER_OF_PROCESSORS + $NUMBER_OF_PROCESSORS / 2`
-fi
-
 run_builds
 
 echo -e "\033]0;compiling done...\007"