1.1 --- a/scripts/crosstool.sh	Sun Jul 27 16:54:28 2008 +0000
     1.2 +++ b/scripts/crosstool.sh	Sat Aug 09 18:03:02 2008 +0000
     1.3 @@ -524,9 +524,9 @@
     1.4  
     1.5      # Install the /populator/
     1.6      CT_DoLog EXTRA "Installing the populate helper"
     1.7 -    sed -r -e 's,@@CT_READELF@@,'"${CT_PREFIX_DIR}/bin/${CT_TARGET}-readelf"',g;'   \
     1.8 -           -e 's,@@CT_SYSROOT_DIR@@,'"${CT_SYSROOT_DIR}"',g;'                       \
     1.9 -           "${CT_LIB_DIR}/tools/populate.in" >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
    1.10 +    sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \
    1.11 +        "${CT_LIB_DIR}/tools/populate.in"           \
    1.12 +        >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
    1.13      chmod 755 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
    1.14  
    1.15      # Create the aliases to the target tools
    1.16 @@ -535,15 +535,13 @@
    1.17      for t in "${CT_TARGET}-"*; do
    1.18          if [ -n "${CT_TARGET_ALIAS}" ]; then
    1.19              _t=$(echo "$t" |sed -r -e 's/^'"${CT_TARGET}"'-/'"${CT_TARGET_ALIAS}"'-/;')
    1.20 -            CT_DoLog DEBUG "Linking '${_t}' -> '${t}'"
    1.21 -            ln -sv "${t}" "${_t}" 2>&1 |CT_DoLog ALL
    1.22 +            ln -sv "${t}" "${_t}" 2>&1
    1.23          fi
    1.24          if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then
    1.25              _t=$(echo "$t" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}")
    1.26 -            CT_DoLog DEBUG "Linking '${_t}' -> '${t}'"
    1.27 -            ln -sv "${t}" "${_t}" 2>&1 |CT_DoLog ALL
    1.28 +            ln -sv "${t}" "${_t}" 2>&1
    1.29          fi
    1.30 -    done
    1.31 +    done |CT_DoLog ALL
    1.32      CT_Popd
    1.33      CT_EndStep
    1.34  

     2.1 --- a/tools/populate.in	Sun Jul 27 16:54:28 2008 +0000
     2.2 +++ b/tools/populate.in	Sat Aug 09 18:03:02 2008 +0000
     2.3 @@ -4,8 +4,10 @@
     2.4  # (C) 2007 Yann E. MORIN
     2.5  # Licensed under the GPL v2
     2.6  
     2.7 -CT_READELF="@@CT_READELF@@"
     2.8 -CT_SYSROOT_DIR="@@CT_SYSROOT_DIR@@"
     2.9 +# Detect where the toolchain is:
    2.10 +BIN_DIR="$(cd "$(dirname "$(readlink -fn "$0")")"; pwd)"
    2.11 +CT_READELF="${BIN_DIR}/@@CT_TARGET@@-readelf"
    2.12 +CT_SYSROOT_DIR="${BIN_DIR}/../@@CT_TARGET@@/sys-root"
    2.13  
    2.14  myname=$(basename "$0")
    2.15