1.1 --- a/scripts/build/binutils/binutils.sh	Sun Jan 02 13:52:16 2011 +0100
     1.2 +++ b/scripts/build/binutils/binutils.sh	Wed Dec 29 18:19:40 2010 +0100
     1.3 @@ -19,6 +19,7 @@
     1.4  do_binutils() {
     1.5      local -a extra_config
     1.6      local -a extra_make_flags
     1.7 +    local -a binutils_tools
     1.8  
     1.9      mkdir -p "${CT_BUILD_DIR}/build-binutils"
    1.10      cd "${CT_BUILD_DIR}/build-binutils"
    1.11 @@ -27,19 +28,24 @@
    1.12  
    1.13      CT_DoLog EXTRA "Configuring binutils"
    1.14  
    1.15 +    binutils_tools=( ar as ld strip )
    1.16      if [ "${CT_BINUTILS_HAS_GOLD}" = "y" ]; then
    1.17          case "${CT_BINUTILS_LINKERS_LIST}" in
    1.18              ld)
    1.19                  extra_config+=( --enable-ld=yes --enable-gold=no )
    1.20 +                binutils_tools+=( ld.bfd )
    1.21                  ;;
    1.22              gold)
    1.23                  extra_config+=( --enable-ld=no --enable-gold=yes )
    1.24 +                binutils_tools+=( ld.gold )
    1.25                  ;;
    1.26              ld,gold)
    1.27                  extra_config+=( --enable-ld=default --enable-gold=yes )
    1.28 +                binutils_tools+=( ld.bfd ld.gold )
    1.29                  ;;
    1.30              gold,ld)
    1.31                  extra_config+=( --enable-ld=yes --enable-gold=default )
    1.32 +                binutils_tools+=( ld.bfd ld.gold )
    1.33                  ;;
    1.34          esac
    1.35          if [ "${CT_BINUTILS_GOLD_THREADED}" = "y" ]; then
    1.36 @@ -79,6 +85,16 @@
    1.37      CT_DoLog EXTRA "Installing binutils"
    1.38      CT_DoExecLog ALL make install
    1.39  
    1.40 +    # Install the wrapper if needed
    1.41 +    if [ "${CT_BINUTILS_LD_WRAPPER}" = "y" ]; then
    1.42 +        CT_DoLog EXTRA "Installing ld wrapper"
    1.43 +        rm -f "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ld"
    1.44 +        sed -r -e "s/@@DEFAULT_LD@@/${CT_BINUTILS_LINKER_DEFAULT}/" \
    1.45 +            "${CT_LIB_DIR}/scripts/build/binutils/binutils-ld.in"   \
    1.46 +            >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-ld"
    1.47 +        chmod +x "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ld"
    1.48 +    fi
    1.49 +
    1.50      # Make those new tools available to the core C compilers to come.
    1.51      # Note: some components want the ${TARGET}-{ar,as,ld,strip} commands as
    1.52      # well. Create that.
    1.53 @@ -86,7 +102,7 @@
    1.54      mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin"
    1.55      mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin"
    1.56      mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin"
    1.57 -    for t in ar as ld strip; do
    1.58 +    for t in "${binutils_tools[@]}"; do
    1.59          ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}"
    1.60          ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
    1.61          ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}"