diff options
Diffstat (limited to 'scripts/build/cc/100-gcc.sh')
| -rw-r--r-- | scripts/build/cc/100-gcc.sh | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh index 0e0f8ed..dfdb7f9 100644 --- a/scripts/build/cc/100-gcc.sh +++ b/scripts/build/cc/100-gcc.sh @@ -13,10 +13,10 @@ do_gcc_get() { else # Account for the Linaro versioning linaro_version="$( echo "${CT_CC_GCC_VERSION}" \ - |${sed} -r -e 's/^linaro-//;' \ + |sed -r -e 's/^linaro-//;' \ )" linaro_series="$( echo "${linaro_version}" \ - |${sed} -r -e 's/-.*//;' \ + |sed -r -e 's/-.*//;' \ )" # The official gcc hosts put gcc under a gcc/release/ directory, @@ -27,7 +27,7 @@ do_gcc_get() { {http,ftp,https}://ftp.gnu.org/gnu/gcc/gcc-${CT_CC_GCC_VERSION} \ ftp://{gcc.gnu.org,sourceware.org}/pub/gcc/releases/gcc-${CT_CC_GCC_VERSION} else - YYMM=`echo ${CT_CC_GCC_VERSION} |cut -d- -f3 |${sed} -e 's,^..,,'` + YYMM=`echo ${CT_CC_GCC_VERSION} |cut -d- -f3 |sed -e 's,^..,,'` CT_GetFile "gcc-${CT_CC_GCC_VERSION}" \ "https://releases.linaro.org/components/toolchain/gcc-linaro/${linaro_version}" \ "https://releases.linaro.org/${YYMM}/components/toolchain/gcc-linaro/${linaro_series}" \ @@ -185,7 +185,7 @@ cc_gcc_multilib_housekeeping() { # sed: prepend dashes or do nothing if default is empty string multilib_defaults=( $( cc_gcc_get_spec multilib_defaults "${cc}" | \ - ${sed} 's/\(^\|[[:space:]]\+\)\([^[:space:]]\)/ -\2/g' ) ) + sed 's/\(^\|[[:space:]]\+\)\([^[:space:]]\)/ -\2/g' ) ) CT_DoLog EXTRA "gcc default flags: '${multilib_defaults}'" multilibs=( $( "${cc}" -print-multi-lib ) ) @@ -238,7 +238,7 @@ cc_gcc_multilib_housekeeping() { sysroot=$( "${cc}" -print-sysroot ) if [ -n "${base}" ]; then CT_DoExecLog ALL mkdir -p "${sysroot}${base}" - lnk=$( echo "${base#/}" | ${sed} -e 's,[^/]*,..,g' ) + lnk=$( echo "${base#/}" | sed -e 's,[^/]*,..,g' ) else lnk=. fi @@ -629,23 +629,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 libgcc_rule="libgcc.mvars" @@ -663,9 +663,9 @@ do_gcc_core_backend() { repair_cc="" fi - CT_DoExecLog ALL ${make} ${JOBSFLAGS} -C gcc ${libgcc_rule} \ + CT_DoExecLog ALL make ${JOBSFLAGS} -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 @@ -694,7 +694,7 @@ do_gcc_core_backend() { esac CT_DoLog EXTRA "Building ${log_txt}" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} ${core_targets_all} + CT_DoExecLog ALL make ${JOBSFLAGS} ${core_targets_all} # Do not pass ${JOBSFLAGS} here: recent GCC builds have been failing # in parallel 'make install' at random locations: libitm, libcilk, @@ -705,7 +705,7 @@ do_gcc_core_backend() { # attempts to remove the destination and re-create it, but another # install gets in the way. CT_DoLog EXTRA "Installing ${log_txt}" - CT_DoExecLog ALL ${make} ${core_targets_install} + CT_DoExecLog ALL make ${core_targets_install} # Remove the libtool "pseudo-libraries": having them in the installed # tree makes the libtoolized utilities that are built next assume @@ -718,9 +718,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 @@ -1130,18 +1130,18 @@ 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 # See the note on issues with parallel 'make install' in GCC above. CT_DoLog EXTRA "Installing final gcc compiler" if [ "${CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES}" = "y" ]; then - CT_DoExecLog ALL ${make} install-strip + CT_DoExecLog ALL make install-strip else - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make install fi # Remove the libtool "pseudo-libraries": having them in the installed @@ -1155,9 +1155,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 |