diff options
Diffstat (limited to 'scripts/build/cc/100-gcc.sh')
| -rw-r--r-- | scripts/build/cc/100-gcc.sh | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh index 2e824d9..5674c30 100644 --- a/scripts/build/cc/100-gcc.sh +++ b/scripts/build/cc/100-gcc.sh @@ -461,23 +461,23 @@ do_gcc_core_backend() { # Next we have to configure gcc, create libgcc.mk then edit it... # So much easier if we just edit the source tree, but hey... if [ ! -f "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" ]; then - CT_DoExecLog CFG make ${JOBSFLAGS} configure-libiberty - CT_DoExecLog ALL make ${JOBSFLAGS} -C libiberty libiberty.a - CT_DoExecLog CFG make ${JOBSFLAGS} configure-gcc configure-libcpp - CT_DoExecLog ALL make ${JOBSFLAGS} all-libcpp + CT_DoExecLog CFG ${make} ${JOBSFLAGS} configure-libiberty + CT_DoExecLog ALL ${make} ${JOBSFLAGS} -C libiberty libiberty.a + CT_DoExecLog CFG ${make} ${JOBSFLAGS} configure-gcc configure-libcpp + CT_DoExecLog ALL ${make} ${JOBSFLAGS} all-libcpp else - CT_DoExecLog CFG make ${JOBSFLAGS} configure-gcc configure-libcpp configure-build-libiberty - CT_DoExecLog ALL make ${JOBSFLAGS} all-libcpp all-build-libiberty + CT_DoExecLog CFG ${make} ${JOBSFLAGS} configure-gcc configure-libcpp configure-build-libiberty + CT_DoExecLog ALL ${make} ${JOBSFLAGS} all-libcpp all-build-libiberty fi # HACK: gcc-4.2 uses libdecnumber to build libgcc.mk, so build it here. if [ -d "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/libdecnumber" ]; then - CT_DoExecLog CFG make ${JOBSFLAGS} configure-libdecnumber - CT_DoExecLog ALL make ${JOBSFLAGS} -C libdecnumber libdecnumber.a + CT_DoExecLog CFG ${make} ${JOBSFLAGS} configure-libdecnumber + CT_DoExecLog ALL ${make} ${JOBSFLAGS} -C libdecnumber libdecnumber.a fi # HACK: gcc-4.8 uses libbacktrace to make libgcc.mvars, so make it here. if [ -d "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/libbacktrace" ]; then - CT_DoExecLog CFG make ${JOBSFLAGS} configure-libbacktrace - CT_DoExecLog ALL make ${JOBSFLAGS} -C libbacktrace + CT_DoExecLog CFG ${make} ${JOBSFLAGS} configure-libbacktrace + CT_DoExecLog ALL ${make} ${JOBSFLAGS} -C libbacktrace fi # Starting with GCC 4.3, libgcc.mk is no longer built, @@ -503,9 +503,9 @@ do_gcc_core_backend() { repair_cc="" fi - CT_DoExecLog ALL make ${JOBSFLAGS} ${extra_user_env} -C gcc ${libgcc_rule} \ + CT_DoExecLog ALL ${make} ${JOBSFLAGS} ${extra_user_env} -C gcc ${libgcc_rule} \ ${repair_cc} - sed -r -i -e 's@-lc@@g' gcc/${libgcc_rule} + ${sed} -r -i -e 's@-lc@@g' gcc/${libgcc_rule} else # build_libgcc core_targets=( gcc ) fi # ! build libgcc @@ -534,10 +534,10 @@ do_gcc_core_backend() { esac CT_DoLog EXTRA "Building ${log_txt}" - CT_DoExecLog ALL make ${JOBSFLAGS} ${extra_user_env} ${core_targets_all} + CT_DoExecLog ALL ${make} ${JOBSFLAGS} ${extra_user_env} ${core_targets_all} CT_DoLog EXTRA "Installing ${log_txt}" - CT_DoExecLog ALL make ${JOBSFLAGS} ${extra_user_env} ${core_targets_install} + CT_DoExecLog ALL ${make} ${JOBSFLAGS} ${extra_user_env} ${core_targets_install} # Remove the libtool "pseudo-libraries": having them in the installed # tree makes the libtoolized utilities that are built next assume @@ -551,9 +551,9 @@ do_gcc_core_backend() { if [ "${build_manuals}" = "yes" ]; then CT_DoLog EXTRA "Building the GCC manuals" - CT_DoExecLog ALL make pdf html + CT_DoExecLog ALL ${make} pdf html CT_DoLog EXTRA "Installing the GCC manuals" - CT_DoExecLog ALL make install-{pdf,html}-gcc + CT_DoExecLog ALL ${make} install-{pdf,html}-gcc fi # Create a symlink ${CT_TARGET}-cc to ${CT_TARGET}-gcc to always be able @@ -937,17 +937,17 @@ do_gcc_backend() { if [ "${CT_CANADIAN}" = "y" ]; then CT_DoLog EXTRA "Building libiberty" - CT_DoExecLog ALL make ${JOBSFLAGS} all-build-libiberty + CT_DoExecLog ALL ${make} ${JOBSFLAGS} all-build-libiberty fi CT_DoLog EXTRA "Building final gcc compiler" - CT_DoExecLog ALL make ${JOBSFLAGS} all + CT_DoExecLog ALL ${make} ${JOBSFLAGS} all CT_DoLog EXTRA "Installing final gcc compiler" if [ "${CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES}" = "y" ]; then - CT_DoExecLog ALL make ${JOBSFLAGS} install-strip + CT_DoExecLog ALL ${make} ${JOBSFLAGS} install-strip else - CT_DoExecLog ALL make ${JOBSFLAGS} install + CT_DoExecLog ALL ${make} ${JOBSFLAGS} install fi # Remove the libtool "pseudo-libraries": having them in the installed @@ -961,9 +961,9 @@ do_gcc_backend() { if [ "${build_manuals}" = "yes" ]; then CT_DoLog EXTRA "Building the GCC manuals" - CT_DoExecLog ALL make pdf html + CT_DoExecLog ALL ${make} pdf html CT_DoLog EXTRA "Installing the GCC manuals" - CT_DoExecLog ALL make install-{pdf,html}-gcc + CT_DoExecLog ALL ${make} install-{pdf,html}-gcc fi # Create a symlink ${CT_TARGET}-cc to ${CT_TARGET}-gcc to always be able |