1.1 --- a/scripts/build/binutils/binutils.sh Sat Jan 22 22:35:18 2011 +0100
1.2 +++ b/scripts/build/binutils/binutils.sh Sat Jan 22 22:35:43 2011 +0100
1.3 @@ -80,7 +80,7 @@
1.4 fi
1.5
1.6 CT_DoLog EXTRA "Building binutils"
1.7 - CT_DoExecLog ALL make "${extra_make_flags[@]}" ${PARALLELMFLAGS}
1.8 + CT_DoExecLog ALL make "${extra_make_flags[@]}" ${JOBSFLAGS}
1.9
1.10 CT_DoLog EXTRA "Installing binutils"
1.11 CT_DoExecLog ALL make install
1.12 @@ -149,7 +149,7 @@
1.13 ${CT_BINUTILS_EXTRA_CONFIG}
1.14
1.15 CT_DoLog EXTRA "Building binutils' libraries (${targets[*]}) for target"
1.16 - CT_DoExecLog ALL make ${PARALLELMFLAGS} "${build_targets[@]}"
1.17 + CT_DoExecLog ALL make ${JOBSFLAGS} "${build_targets[@]}"
1.18 CT_DoLog EXTRA "Installing binutils' libraries (${targets[*]}) for target"
1.19 CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" "${install_targets[@]}"
1.20
2.1 --- a/scripts/build/binutils/elf2flt.sh Sat Jan 22 22:35:18 2011 +0100
2.2 +++ b/scripts/build/binutils/elf2flt.sh Sat Jan 22 22:35:43 2011 +0100
2.3 @@ -52,7 +52,7 @@
2.4 ${CT_ELF2FLT_EXTRA_CONFIG}
2.5
2.6 CT_DoLog EXTRA "Building elf2flt"
2.7 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
2.8 + CT_DoExecLog ALL make ${JOBSFLAGS}
2.9
2.10 CT_DoLog EXTRA "Installing elf2flt"
2.11 CT_DoExecLog ALL make install
3.1 --- a/scripts/build/cc/gcc.sh Sat Jan 22 22:35:18 2011 +0100
3.2 +++ b/scripts/build/cc/gcc.sh Sat Jan 22 22:35:43 2011 +0100
3.3 @@ -269,17 +269,17 @@
3.4 # So much easier if we just edit the source tree, but hey...
3.5 if [ ! -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ]; then
3.6 CT_DoExecLog CFG make configure-libiberty
3.7 - CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libiberty libiberty.a
3.8 + CT_DoExecLog ALL make ${JOBSFLAGS} -C libiberty libiberty.a
3.9 CT_DoExecLog CFG make configure-gcc configure-libcpp
3.10 - CT_DoExecLog ALL make ${PARALLELMFLAGS} all-libcpp
3.11 + CT_DoExecLog ALL make ${JOBSFLAGS} all-libcpp
3.12 else
3.13 CT_DoExecLog CFG make configure-gcc configure-libcpp configure-build-libiberty
3.14 - CT_DoExecLog ALL make ${PARALLELMFLAGS} all-libcpp all-build-libiberty
3.15 + CT_DoExecLog ALL make ${JOBSFLAGS} all-libcpp all-build-libiberty
3.16 fi
3.17 # HACK: gcc-4.2 uses libdecnumber to build libgcc.mk, so build it here.
3.18 if [ -d "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/libdecnumber" ]; then
3.19 CT_DoExecLog CFG make configure-libdecnumber
3.20 - CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libdecnumber libdecnumber.a
3.21 + CT_DoExecLog ALL make ${JOBSFLAGS} -C libdecnumber libdecnumber.a
3.22 fi
3.23
3.24 # Starting with GCC 4.3, libgcc.mk is no longer built,
3.25 @@ -304,7 +304,7 @@
3.26 repair_cc=""
3.27 fi
3.28
3.29 - CT_DoExecLog ALL make ${PARALLELMFLAGS} -C gcc ${libgcc_rule} \
3.30 + CT_DoExecLog ALL make ${JOBSFLAGS} -C gcc ${libgcc_rule} \
3.31 ${repair_cc}
3.32 sed -r -i -e 's@-lc@@g' gcc/${libgcc_rule}
3.33 else # build_libgcc
3.34 @@ -317,7 +317,7 @@
3.35 fi
3.36
3.37 CT_DoLog EXTRA "Building ${mode} core C compiler"
3.38 - CT_DoExecLog ALL make ${PARALLELMFLAGS} "${core_targets[@]/#/all-}"
3.39 + CT_DoExecLog ALL make ${JOBSFLAGS} "${core_targets[@]/#/all-}"
3.40
3.41 CT_DoLog EXTRA "Installing ${mode} core C compiler"
3.42 CT_DoExecLog ALL make "${core_targets[@]/#/install-}"
3.43 @@ -520,11 +520,11 @@
3.44
3.45 if [ "${CT_CANADIAN}" = "y" ]; then
3.46 CT_DoLog EXTRA "Building libiberty"
3.47 - CT_DoExecLog ALL make ${PARALLELMFLAGS} all-build-libiberty
3.48 + CT_DoExecLog ALL make ${JOBSFLAGS} all-build-libiberty
3.49 fi
3.50
3.51 CT_DoLog EXTRA "Building final compiler"
3.52 - CT_DoExecLog ALL make ${PARALLELMFLAGS} all
3.53 + CT_DoExecLog ALL make ${JOBSFLAGS} all
3.54
3.55 CT_DoLog EXTRA "Installing final compiler"
3.56 CT_DoExecLog ALL make install
4.1 --- a/scripts/build/companion_libs/cloog.sh Sat Jan 22 22:35:18 2011 +0100
4.2 +++ b/scripts/build/companion_libs/cloog.sh Sat Jan 22 22:35:43 2011 +0100
4.3 @@ -75,11 +75,11 @@
4.4 "${cloog_opts[@]}"
4.5
4.6 CT_DoLog EXTRA "Building CLooG/ppl"
4.7 - CT_DoExecLog ALL make ${PARALLELMFLAGS} libcloog.la
4.8 + CT_DoExecLog ALL make ${JOBSFLAGS} libcloog.la
4.9
4.10 if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then
4.11 CT_DoLog EXTRA "Checking CLooG/ppl"
4.12 - CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check
4.13 + CT_DoExecLog ALL make ${JOBSFLAGS} -s check
4.14 fi
4.15
4.16 CT_DoLog EXTRA "Installing CLooG/ppl"
5.1 --- a/scripts/build/companion_libs/gmp.sh Sat Jan 22 22:35:18 2011 +0100
5.2 +++ b/scripts/build/companion_libs/gmp.sh Sat Jan 22 22:35:43 2011 +0100
5.3 @@ -48,11 +48,11 @@
5.4 "${gmp_opts[@]}"
5.5
5.6 CT_DoLog EXTRA "Building GMP"
5.7 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
5.8 + CT_DoExecLog ALL make ${JOBSFLAGS}
5.9
5.10 if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then
5.11 CT_DoLog EXTRA "Checking GMP"
5.12 - CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check
5.13 + CT_DoExecLog ALL make ${JOBSFLAGS} -s check
5.14 fi
5.15
5.16 CT_DoLog EXTRA "Installing GMP"
6.1 --- a/scripts/build/companion_libs/mpc.sh Sat Jan 22 22:35:18 2011 +0100
6.2 +++ b/scripts/build/companion_libs/mpc.sh Sat Jan 22 22:35:43 2011 +0100
6.3 @@ -48,11 +48,11 @@
6.4 "${mpc_opts[@]}"
6.5
6.6 CT_DoLog EXTRA "Building MPC"
6.7 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
6.8 + CT_DoExecLog ALL make ${JOBSFLAGS}
6.9
6.10 if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then
6.11 CT_DoLog EXTRA "Checking MPC"
6.12 - CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check
6.13 + CT_DoExecLog ALL make ${JOBSFLAGS} -s check
6.14 fi
6.15
6.16 CT_DoLog EXTRA "Installing MPC"
7.1 --- a/scripts/build/companion_libs/mpfr.sh Sat Jan 22 22:35:18 2011 +0100
7.2 +++ b/scripts/build/companion_libs/mpfr.sh Sat Jan 22 22:35:43 2011 +0100
7.3 @@ -97,11 +97,11 @@
7.4 "${mpfr_opts[@]}"
7.5
7.6 CT_DoLog EXTRA "Building MPFR"
7.7 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
7.8 + CT_DoExecLog ALL make ${JOBSFLAGS}
7.9
7.10 if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then
7.11 CT_DoLog EXTRA "Checking MPFR"
7.12 - CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check
7.13 + CT_DoExecLog ALL make ${JOBSFLAGS} -s check
7.14 fi
7.15
7.16 CT_DoLog EXTRA "Installing MPFR"
8.1 --- a/scripts/build/companion_libs/ppl.sh Sat Jan 22 22:35:18 2011 +0100
8.2 +++ b/scripts/build/companion_libs/ppl.sh Sat Jan 22 22:35:43 2011 +0100
8.3 @@ -59,11 +59,11 @@
8.4 # --enable-optimization=speed or sspeed (yes, with 2 's')
8.5
8.6 CT_DoLog EXTRA "Building PPL"
8.7 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
8.8 + CT_DoExecLog ALL make ${JOBSFLAGS}
8.9
8.10 if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then
8.11 CT_DoLog EXTRA "Checking PPL"
8.12 - CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check
8.13 + CT_DoExecLog ALL make ${JOBSFLAGS} -s check
8.14 fi
8.15
8.16 CT_DoLog EXTRA "Installing PPL"
9.1 --- a/scripts/build/debug/300-gdb.sh Sat Jan 22 22:35:18 2011 +0100
9.2 +++ b/scripts/build/debug/300-gdb.sh Sat Jan 22 22:35:43 2011 +0100
9.3 @@ -123,7 +123,7 @@
9.4 "${cross_extra_config[@]}"
9.5
9.6 CT_DoLog EXTRA "Building cross-gdb"
9.7 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
9.8 + CT_DoExecLog ALL make ${JOBSFLAGS}
9.9
9.10 CT_DoLog EXTRA "Installing cross-gdb"
9.11 CT_DoExecLog ALL make install
9.12 @@ -169,8 +169,8 @@
9.13 # extension appended to executables. Find that.
9.14 tic_ext=$(grep -E '^x[[:space:]]*=' progs/Makefile |sed -r -e 's/^.*=[[:space:]]*//;')
9.15
9.16 - CT_DoExecLog ALL make ${PARALLELMFLAGS} -C include
9.17 - CT_DoExecLog ALL make ${PARALLELMFLAGS} -C progs "tic${tic_ext}"
9.18 + CT_DoExecLog ALL make ${JOBSFLAGS} -C include
9.19 + CT_DoExecLog ALL make ${JOBSFLAGS} -C progs "tic${tic_ext}"
9.20
9.21 CT_DoExecLog ALL install -d -m 0755 "${CT_PREFIX_DIR}/buildtools"
9.22 CT_DoExecLog ALL install -m 0755 "progs/tic${tic_ext}" "${CT_PREFIX_DIR}/buildtools"
9.23 @@ -192,7 +192,7 @@
9.24 --enable-termcap \
9.25 "${ncurses_opts[@]}"
9.26
9.27 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
9.28 + CT_DoExecLog ALL make ${JOBSFLAGS}
9.29
9.30 CT_DoExecLog ALL make install
9.31
9.32 @@ -219,7 +219,7 @@
9.33 --enable-static \
9.34 --disable-shared
9.35
9.36 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
9.37 + CT_DoExecLog ALL make ${JOBSFLAGS}
9.38 CT_DoExecLog ALL make install
9.39
9.40 native_extra_config+=("--with-expat")
9.41 @@ -269,7 +269,7 @@
9.42 "${native_extra_config[@]}"
9.43
9.44 CT_DoLog EXTRA "Building native gdb"
9.45 - CT_DoExecLog ALL make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC}
9.46 + CT_DoExecLog ALL make ${JOBSFLAGS} CC=${CT_TARGET}-${CT_CC}
9.47
9.48 CT_DoLog EXTRA "Installing native gdb"
9.49 CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install
9.50 @@ -334,7 +334,7 @@
9.51 "${gdbserver_extra_config[@]}"
9.52
9.53 CT_DoLog EXTRA "Building gdbserver"
9.54 - CT_DoExecLog ALL make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC}
9.55 + CT_DoExecLog ALL make ${JOBSFLAGS} CC=${CT_TARGET}-${CT_CC}
9.56
9.57 CT_DoLog EXTRA "Installing gdbserver"
9.58 CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install
10.1 --- a/scripts/build/libc/glibc.sh Sat Jan 22 22:35:18 2011 +0100
10.2 +++ b/scripts/build/libc/glibc.sh Sat Jan 22 22:35:43 2011 +0100
10.3 @@ -227,14 +227,12 @@
10.4 RANLIB=${CT_TARGET}-ranlib \
10.5 OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" \
10.6 ASFLAGS="${GLIBC_INITIAL_BUILD_ASFLAGS}" \
10.7 - PARALLELMFLAGS="${PARALLELMFLAGS}" \
10.8 all
10.9
10.10 CT_DoLog EXTRA "Installing C library"
10.11 CT_DoExecLog ALL make install_root="${CT_SYSROOT_DIR}" \
10.12 ${LIBC_SYSROOT_ARG} \
10.13 OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" \
10.14 - PARALLELMFLAGS="${PARALLELMFLAGS}" \
10.15 install
10.16
10.17 # This doesn't seem to work when building a crosscompiler,
11.1 --- a/scripts/build/libc/mingw.sh Sat Jan 22 22:35:18 2011 +0100
11.2 +++ b/scripts/build/libc/mingw.sh Sat Jan 22 22:35:43 2011 +0100
11.3 @@ -70,7 +70,7 @@
11.4 --host=${CT_TARGET}
11.5
11.6 CT_DoLog EXTRA "Building W32-API"
11.7 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
11.8 + CT_DoExecLog ALL make ${JOBSFLAGS}
11.9
11.10 CT_DoLog EXTRA "Installing W32-API"
11.11 CT_DoExecLog ALL make install
11.12 @@ -89,7 +89,7 @@
11.13 --host=${CT_TARGET}
11.14
11.15 CT_DoLog EXTRA "Building MinGW Runtime"
11.16 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
11.17 + CT_DoExecLog ALL make ${JOBSFLAGS}
11.18
11.19 CT_DoLog EXTRA "Installing MinGW Runtime"
11.20 CT_DoExecLog ALL make install
11.21 @@ -148,7 +148,7 @@
11.22 --enable-static
11.23
11.24 CT_DoLog EXTRA "Building GnuRX development files"
11.25 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
11.26 + CT_DoExecLog ALL make ${JOBSFLAGS}
11.27
11.28 CT_DoLog EXTRA "Installing GnuRX development files"
11.29 CT_DoExecLog ALL make install-dev
12.1 --- a/scripts/build/libc/newlib.sh Sat Jan 22 22:35:18 2011 +0100
12.2 +++ b/scripts/build/libc/newlib.sh Sat Jan 22 22:35:43 2011 +0100
12.3 @@ -101,7 +101,7 @@
12.4 "${newlib_opts[@]}"
12.5
12.6 CT_DoLog EXTRA "Building C library"
12.7 - CT_DoExecLog ALL make ${PARALLELMFLAGS}
12.8 + CT_DoExecLog ALL make ${JOBSFLAGS}
12.9
12.10 CT_DoLog EXTRA "Installing C library"
12.11 CT_DoExecLog ALL make install install_root="${CT_SYSROOT_DIR}"
13.1 --- a/scripts/build/libc/uClibc.sh Sat Jan 22 22:35:18 2011 +0100
13.2 +++ b/scripts/build/libc/uClibc.sh Sat Jan 22 22:35:43 2011 +0100
13.3 @@ -138,7 +138,7 @@
13.4 if [ "${CT_THREADS}" = "nptl" ]; then
13.5 CT_DoLog EXTRA "Building start files"
13.6 CT_DoExecLog ALL \
13.7 - make ${CT_LIBC_UCLIBC_PARALLEL:+${PARALLELMFLAGS}} \
13.8 + make ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}} \
13.9 CROSS="${cross}" \
13.10 PREFIX="${CT_SYSROOT_DIR}/" \
13.11 STRIPTOOL=true \
13.12 @@ -208,7 +208,7 @@
13.13 LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
13.14 pregen
13.15 CT_DoExecLog ALL \
13.16 - make ${CT_LIBC_UCLIBC_PARALLEL:+${PARALLELMFLAGS}} \
13.17 + make ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}} \
13.18 CROSS=${CT_TARGET}- \
13.19 PREFIX="${CT_SYSROOT_DIR}/" \
13.20 STRIPTOOL=true \
13.21 @@ -228,7 +228,7 @@
13.22 # We do _not_ want to strip anything for now, in case we specifically
13.23 # asked for a debug toolchain, hence the STRIPTOOL= assignment
13.24 #
13.25 - # Note: PARALLELMFLAGS is not usefull for installation.
13.26 + # Note: JOBSFLAGS is not usefull for installation.
13.27 #
13.28 CT_DoLog EXTRA "Installing C library"
13.29 CT_DoExecLog ALL \
14.1 --- a/scripts/crosstool-NG.sh.in Sat Jan 22 22:35:18 2011 +0100
14.2 +++ b/scripts/crosstool-NG.sh.in Sat Jan 22 22:35:43 2011 +0100
14.3 @@ -495,10 +495,9 @@
14.4 export SHELL="${CT_SHELL}" # for Makefiles
14.5
14.6 # And help make go faster
14.7 - PARALLELMFLAGS=
14.8 - [ ${CT_PARALLEL_JOBS} -ne 0 ] && PARALLELMFLAGS="${PARALLELMFLAGS} -j${CT_PARALLEL_JOBS}"
14.9 - [ ${CT_LOAD} -ne 0 ] && PARALLELMFLAGS="${PARALLELMFLAGS} -l${CT_LOAD}"
14.10 - export PARALLELMFLAGS
14.11 + JOBSFLAGS=
14.12 + [ ${CT_PARALLEL_JOBS} -ne 0 ] && JOBSFLAGS="${JOBSFLAGS} -j${CT_PARALLEL_JOBS}"
14.13 + [ ${CT_LOAD} -ne 0 ] && JOBSFLAGS="${JOBSFLAGS} -l${CT_LOAD}"
14.14
14.15 CT_DoLog EXTRA "Installing user-supplied crosstool-NG configuration"
14.16 CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin"