1.1 --- a/scripts/crosstool-NG.sh.in Sun Oct 09 19:19:04 2011 +0200
1.2 +++ b/scripts/crosstool-NG.sh.in Sun Oct 16 13:26:26 2011 +0200
1.3 @@ -469,9 +469,6 @@
1.4 [ "${CT_USE_PIPES}" = "y" ] && CT_CFLAGS_FOR_HOST+=" -pipe"
1.5 CT_CFLAGS_FOR_HOST+="${CT_EXTRA_FLAGS_FOR_HOST}"
1.6
1.7 - # Override the configured jobs with what's been given on the command line
1.8 - [ -n "${CT_JOBS}" ] && CT_PARALLEL_JOBS="${CT_JOBS}"
1.9 -
1.10 # Set the shell to be used by ./configure scripts and by Makefiles (those
1.11 # that support it!).
1.12 export CONFIG_SHELL="${CT_CONFIG_SHELL}" # for ./configure
1.13 @@ -479,10 +476,12 @@
1.14
1.15 # And help make go faster
1.16 JOBSFLAGS=
1.17 + # Override the configured jobs with what's been given on the command line
1.18 + [ -n "${CT_JOBS}" ] && CT_PARALLEL_JOBS="${CT_JOBS}"
1.19 # Use the number of processors+1 when automatically setting the number of
1.20 # parallel jobs. Fall back to 1 if the host doesn't use GLIBC.
1.21 AUTO_JOBS=$((`getconf _NPROCESSORS_ONLN 2> /dev/null || echo 0` + 1))
1.22 - [ ${CT_PARALLEL_JOBS} -eq -1 ] && JOBSFLAGS="${JOBSFLAGS} -j${AUTO_JOBS}"
1.23 + [ ${CT_PARALLEL_JOBS} -eq 0 ] && JOBSFLAGS="${JOBSFLAGS} -j${AUTO_JOBS}"
1.24 [ ${CT_PARALLEL_JOBS} -gt 0 ] && JOBSFLAGS="${JOBSFLAGS} -j${CT_PARALLEL_JOBS}"
1.25 [ ${CT_LOAD} -ne 0 ] && JOBSFLAGS="${JOBSFLAGS} -l${CT_LOAD}"
1.26