diff options
Diffstat (limited to 'scripts/build/binutils/binutils.sh')
| -rw-r--r-- | scripts/build/binutils/binutils.sh | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh index 65a2dcce..0e285b61 100644 --- a/scripts/build/binutils/binutils.sh +++ b/scripts/build/binutils/binutils.sh @@ -8,8 +8,8 @@ do_binutils_get() { CT_GetCustom "binutils" "${CT_BINUTILS_CUSTOM_VERSION}" \ "${CT_BINUTILS_CUSTOM_LOCATION}" else - if echo ${CT_BINUTILS_VERSION} |${grep} -q linaro; then - YYMM=`echo ${CT_BINUTILS_VERSION} |cut -d- -f3 |${sed} -e 's,^..,,'` + if echo ${CT_BINUTILS_VERSION} |grep -q linaro; then + YYMM=`echo ${CT_BINUTILS_VERSION} |cut -d- -f3 |sed -e 's,^..,,'` CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \ https://releases.linaro.org/${YYMM}/components/toolchain/binutils-linaro \ http://cbuild.validation.linaro.org/snapshots @@ -132,7 +132,7 @@ do_binutils_for_host() { mkdir -p "${CT_BUILDTOOLS_PREFIX_DIR}/bin" for t in "${binutils_tools[@]}"; do CT_DoExecLog ALL ln -sv \ - "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" \ + "${CT_PREFIX_DIR}/${CT_TARGET}/bin/${t}" \ "${CT_BUILDTOOLS_PREFIX_DIR}/${CT_TARGET}/bin/${t}" CT_DoExecLog ALL ln -sv \ "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" \ @@ -230,14 +230,14 @@ do_binutils_backend() { if [ "${static_build}" = "y" ]; then extra_make_flags+=("LDFLAGS=${ldflags} -all-static") CT_DoLog EXTRA "Prepare binutils for static build" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} configure-host + CT_DoExecLog ALL make ${JOBSFLAGS} configure-host fi CT_DoLog EXTRA "Building binutils" - CT_DoExecLog ALL ${make} "${extra_make_flags[@]}" ${JOBSFLAGS} + CT_DoExecLog ALL make "${extra_make_flags[@]}" ${JOBSFLAGS} CT_DoLog EXTRA "Installing binutils" - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make install if [ "${build_manuals}" = "y" ]; then CT_DoLog EXTRA "Building and installing the binutils manuals" @@ -247,8 +247,8 @@ do_binutils_backend() { fi manuals_install=( "${manuals_for[@]/\#/install-pdf-}" ) manuals_install+=( "${manuals_for[@]/\#/install-html-}" ) - CT_DoExecLog ALL ${make} ${JOBSFLAGS} pdf html - CT_DoExecLog ALL ${make} "${manuals_install[@]}" + CT_DoExecLog ALL make ${JOBSFLAGS} pdf html + CT_DoExecLog ALL make "${manuals_install[@]}" fi # Install the wrapper if needed @@ -256,7 +256,7 @@ do_binutils_backend() { CT_DoLog EXTRA "Installing ld wrapper" rm -f "${prefix}/bin/${CT_TARGET}-ld" rm -f "${prefix}/${CT_TARGET}/bin/ld" - ${sed} -r -e "s/@@DEFAULT_LD@@/${CT_BINUTILS_LINKER_DEFAULT}/" \ + sed -r -e "s/@@DEFAULT_LD@@/${CT_BINUTILS_LINKER_DEFAULT}/" \ "${CT_LIB_DIR}/scripts/build/binutils/binutils-ld.in" \ >"${prefix}/bin/${CT_TARGET}-ld" chmod +x "${prefix}/bin/${CT_TARGET}-ld" @@ -309,14 +309,15 @@ do_elf2flt_backend() { --with-binutils-include-dir=${binutils_src}/include \ --with-libbfd=${binutils_bld}/bfd/libbfd.a \ --with-libiberty=${binutils_bld}/libiberty/libiberty.a \ + --disable-werror \ ${elf2flt_opts} \ "${CT_ELF2FLT_EXTRA_CONFIG_ARRAY[@]}" CT_DoLog EXTRA "Building elf2flt" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} + CT_DoExecLog ALL make ${JOBSFLAGS} CT_DoLog EXTRA "Installing elf2flt" - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make install } # Now on for the target libraries @@ -371,9 +372,9 @@ do_binutils_for_target() { "${CT_BINUTILS_EXTRA_CONFIG_ARRAY[@]}" CT_DoLog EXTRA "Building binutils' libraries (${targets[*]}) for target" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} "${build_targets[@]}" + CT_DoExecLog ALL make ${JOBSFLAGS} "${build_targets[@]}" CT_DoLog EXTRA "Installing binutils' libraries (${targets[*]}) for target" - CT_DoExecLog ALL ${make} DESTDIR="${CT_SYSROOT_DIR}" "${install_targets[@]}" + CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" "${install_targets[@]}" CT_Popd CT_EndStep |