config: use '0' for automatic number of jobs
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Oct 16 13:26:26 2011 +0200 (2011-10-16)
changeset 2716afa3fde1f7a7
parent 2715 1c36d654c976
child 2717 13df2720b374
config: use '0' for automatic number of jobs

Also, make it the default.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
config/global/build-behave.in
scripts/crosstool-NG.sh.in
     1.1 --- a/config/global/build-behave.in	Wed Sep 28 13:08:18 2011 +0200
     1.2 +++ b/config/global/build-behave.in	Sun Oct 16 13:26:26 2011 +0200
     1.3 @@ -8,15 +8,15 @@
     1.4  config PARALLEL_JOBS
     1.5      int
     1.6      prompt "Number of parallel jobs" if ! BACKEND
     1.7 -    default 1
     1.8 +    default 0
     1.9      help
    1.10        Number of jobs make will be allowed to run concurently.
    1.11        Set this higher than the number of processors you have, but not too high.
    1.12        A good rule of thumb is twice the number of processors you have.
    1.13        
    1.14 -      Enter 1 (or 0) to have only one job at a time.
    1.15 +      Enter 1 to have only one job at a time.
    1.16  
    1.17 -      Enter -1 to set automatically based on how many processors the host has.
    1.18 +      Enter 0 to set automatically based on how many processors the host has.
    1.19  
    1.20  config LOAD
    1.21      int
     2.1 --- a/scripts/crosstool-NG.sh.in	Wed Sep 28 13:08:18 2011 +0200
     2.2 +++ b/scripts/crosstool-NG.sh.in	Sun Oct 16 13:26:26 2011 +0200
     2.3 @@ -469,9 +469,6 @@
     2.4      [ "${CT_USE_PIPES}" = "y" ] && CT_CFLAGS_FOR_HOST+=" -pipe"
     2.5      CT_CFLAGS_FOR_HOST+="${CT_EXTRA_FLAGS_FOR_HOST}"
     2.6  
     2.7 -    # Override the configured jobs with what's been given on the command line
     2.8 -    [ -n "${CT_JOBS}" ] && CT_PARALLEL_JOBS="${CT_JOBS}"
     2.9 -
    2.10      # Set the shell to be used by ./configure scripts and by Makefiles (those
    2.11      # that support it!).
    2.12      export CONFIG_SHELL="${CT_CONFIG_SHELL}"    # for ./configure
    2.13 @@ -479,10 +476,12 @@
    2.14  
    2.15      # And help make go faster
    2.16      JOBSFLAGS=
    2.17 +    # Override the configured jobs with what's been given on the command line
    2.18 +    [ -n "${CT_JOBS}" ] && CT_PARALLEL_JOBS="${CT_JOBS}"
    2.19      # Use the number of processors+1 when automatically setting the number of
    2.20      # parallel jobs.  Fall back to 1 if the host doesn't use GLIBC.
    2.21      AUTO_JOBS=$((`getconf _NPROCESSORS_ONLN 2> /dev/null || echo 0` + 1))
    2.22 -    [ ${CT_PARALLEL_JOBS} -eq -1 ] && JOBSFLAGS="${JOBSFLAGS} -j${AUTO_JOBS}"
    2.23 +    [ ${CT_PARALLEL_JOBS} -eq 0 ] && JOBSFLAGS="${JOBSFLAGS} -j${AUTO_JOBS}"
    2.24      [ ${CT_PARALLEL_JOBS} -gt 0 ] && JOBSFLAGS="${JOBSFLAGS} -j${CT_PARALLEL_JOBS}"
    2.25      [ ${CT_LOAD} -ne 0 ] && JOBSFLAGS="${JOBSFLAGS} -l${CT_LOAD}"
    2.26