# HG changeset patch # User "Yann E. MORIN" # Date 1318764386 -7200 # Node ID afa3fde1f7a700556fedd8f6df26a3b15c1b645d # Parent 1c36d654c976952df2e27474887e9a0be8093203 config: use '0' for automatic number of jobs Also, make it the default. Signed-off-by: "Yann E. MORIN" diff -r 1c36d654c976 -r afa3fde1f7a7 config/global/build-behave.in --- a/config/global/build-behave.in Wed Sep 28 13:08:18 2011 +0200 +++ b/config/global/build-behave.in Sun Oct 16 13:26:26 2011 +0200 @@ -8,15 +8,15 @@ config PARALLEL_JOBS int prompt "Number of parallel jobs" if ! BACKEND - default 1 + default 0 help Number of jobs make will be allowed to run concurently. Set this higher than the number of processors you have, but not too high. A good rule of thumb is twice the number of processors you have. - Enter 1 (or 0) to have only one job at a time. + Enter 1 to have only one job at a time. - Enter -1 to set automatically based on how many processors the host has. + Enter 0 to set automatically based on how many processors the host has. config LOAD int diff -r 1c36d654c976 -r afa3fde1f7a7 scripts/crosstool-NG.sh.in --- a/scripts/crosstool-NG.sh.in Wed Sep 28 13:08:18 2011 +0200 +++ b/scripts/crosstool-NG.sh.in Sun Oct 16 13:26:26 2011 +0200 @@ -469,9 +469,6 @@ [ "${CT_USE_PIPES}" = "y" ] && CT_CFLAGS_FOR_HOST+=" -pipe" CT_CFLAGS_FOR_HOST+="${CT_EXTRA_FLAGS_FOR_HOST}" - # Override the configured jobs with what's been given on the command line - [ -n "${CT_JOBS}" ] && CT_PARALLEL_JOBS="${CT_JOBS}" - # Set the shell to be used by ./configure scripts and by Makefiles (those # that support it!). export CONFIG_SHELL="${CT_CONFIG_SHELL}" # for ./configure @@ -479,10 +476,12 @@ # And help make go faster JOBSFLAGS= + # Override the configured jobs with what's been given on the command line + [ -n "${CT_JOBS}" ] && CT_PARALLEL_JOBS="${CT_JOBS}" # Use the number of processors+1 when automatically setting the number of # parallel jobs. Fall back to 1 if the host doesn't use GLIBC. AUTO_JOBS=$((`getconf _NPROCESSORS_ONLN 2> /dev/null || echo 0` + 1)) - [ ${CT_PARALLEL_JOBS} -eq -1 ] && JOBSFLAGS="${JOBSFLAGS} -j${AUTO_JOBS}" + [ ${CT_PARALLEL_JOBS} -eq 0 ] && JOBSFLAGS="${JOBSFLAGS} -j${AUTO_JOBS}" [ ${CT_PARALLEL_JOBS} -gt 0 ] && JOBSFLAGS="${JOBSFLAGS} -j${CT_PARALLEL_JOBS}" [ ${CT_LOAD} -ne 0 ] && JOBSFLAGS="${JOBSFLAGS} -l${CT_LOAD}"