ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

builder: Limit ninja jobs on Windows. 

On Windows (msys2) ninja may fail to work with -j 64 because it runs out
of open handles.

Limit jobs for ninja to 32 on Windows.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2019-12-05 14:09:45 +00:00
parent 6c2850cd59
commit d395e05d97
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/builder/core.sh
View File

@ -1396,7 +1396,7 @@ build_dist() {
fi
dist_post_configure "$current_dist"
eval "set -- $(dist_ninja_args "$current_dist")"
echo_run ninja -j $NUM_CPUS "$@"
echo_run ninja "$@"
if [ -z "$install_override" ]; then
rm -rf destdir
@ -1506,7 +1506,7 @@ build_dist() {
fi
dist_post_configure "$current_dist"
eval "set -- $(dist_ninja_args "$current_dist")"
echo_run ninja -j$NUM_CPUS "$@"
echo_run ninja "$@"
if [ -z "$install_override" ]; then
rm -rf destdir
@ -2227,7 +2227,12 @@ dist_ninja_args() {
current_dist=$1
[ -n "$current_dist" ] || die 'dist_ninja_args: dist name required'
puts "-v $(table_line DIST_MAKE_ARGS $current_dist)" || :
_num_cpus=$NUM_CPUS
# ninja hits the open file limit on windows
[ "$os" = windows ] && [ $_num_cpus -gt 32 ] && _num_cpus=32
puts "-v $(table_line DIST_MAKE_ARGS $current_dist) -j $_num_cpus" || :
}
dist_make_install_args() {