diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2017-04-25 22:05:32 +0200 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2017-04-25 22:05:32 +0200 |
| commit | dc04338f6d4e10559adc075d5a2c7d335e0a8a7e (patch) | |
| tree | 1ffa753d12f5e5f0041f5c8f793d7373e985f39e | |
| parent | 8056f3533be5ad73aa6b53d2edf4bd6f374db2b1 (diff) | |
[buildsteps][windows] correct evaluation of make jobs
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | tools/buildsteps/win32/buildhelpers.sh | 6 | ||||
| -rw-r--r-- | tools/buildsteps/win32/make-mingwlibs.sh | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore index d4e933666b..5602addb8b 100644 --- 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 index 34663b8275..b39c86a92f 100644 --- 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 index e657e964b5..ee241c71d7 100644 --- 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" |