changeset 3316:f11beaa3e1f0

mk-dist: Don't set -j option to 9 by default. Use --jobs or settings.mk file to override. * mk-dist: Don't set -j option to 9 by default.
author Rik <rik@octave.org>
date Tue, 12 Nov 2013 14:40:58 -0800
parents a1ae8c657ad7
children 819e316a7977
files mk-dist
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mk-dist	Tue Nov 12 19:11:48 2013 -0500
+++ b/mk-dist	Tue Nov 12 14:40:58 2013 -0800
@@ -2,7 +2,8 @@
 
 set -e
 
-jobs=9
+## Override with --jobs option or set JOBS variable in settings.mk
+jobs=0
 
 OCTAVE_TARGET=octave
 
@@ -59,7 +60,11 @@
 mkdir -p $OCTAVE_DIST_DIR
 
 echo "building octave and dependencies..."
-make $OCTAVE_TARGET $INSTALLER_PKG msys-base native-gcc native-binutils octave-forge-packages npp units JOBS=$jobs
+if [ $jobs -gt 0 ]; then
+  make $OCTAVE_TARGET $INSTALLER_PKG msys-base native-gcc native-binutils octave-forge-packages npp units JOBS=$jobs
+else
+  make $OCTAVE_TARGET $INSTALLER_PKG msys-base native-gcc native-binutils octave-forge-packages npp units
+fi
 
 echo "generating lists of files to exclude..."