diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-08-04 08:44:54 (GMT) |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-08-04 08:44:54 (GMT) |
commit | 379ea09dbacbe4535cd40fede2eb93c588cfbb1e (patch) | |
tree | be04c0b46257bd67e9b0e2d841fde177510e78a9 /scripts | |
parent | 4eeadf87e2e338544d1311c702d850bfadfb6632 (diff) |
Michael ABBOTT reported that populate is not relocatable.
Fix this by determining both the cross-readelf and the sys-root at runtime, not at build time.
/trunk/configure | 1 1 0 0 +
/trunk/scripts/crosstool.sh | 14 6 8 0 ++++++--------
/trunk/tools/populate.in | 6 4 2 0 ++++--
3 files changed, 11 insertions(+), 10 deletions(-)
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/crosstool.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh index 2f6660a..aa2105f 100755 --- a/scripts/crosstool.sh +++ b/scripts/crosstool.sh @@ -427,9 +427,9 @@ if [ "${CT_ONLY_DOWNLOAD}" != "y" -a "${CT_ONLY_EXTRACT}" != "y" ]; then # Install the /populator/ CT_DoLog EXTRA "Installing the populate helper" - sed -r -e 's,@@CT_READELF@@,'"${CT_PREFIX_DIR}/bin/${CT_TARGET}-readelf"',g;' \ - -e 's,@@CT_SYSROOT_DIR@@,'"${CT_SYSROOT_DIR}"',g;' \ - "${CT_LIB_DIR}/tools/populate.in" >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate" + sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \ + "${CT_LIB_DIR}/tools/populate.in" \ + >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate" chmod 755 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate" # Create the aliases to the target tools @@ -438,15 +438,13 @@ if [ "${CT_ONLY_DOWNLOAD}" != "y" -a "${CT_ONLY_EXTRACT}" != "y" ]; then for t in "${CT_TARGET}-"*; do if [ -n "${CT_TARGET_ALIAS}" ]; then _t=$(echo "$t" |sed -r -e 's/^'"${CT_TARGET}"'-/'"${CT_TARGET_ALIAS}"'-/;') - CT_DoLog DEBUG "Linking '${_t}' -> '${t}'" - ln -sv "${t}" "${_t}" 2>&1 |CT_DoLog ALL + ln -sv "${t}" "${_t}" 2>&1 fi if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then _t=$(echo "$t" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}") - CT_DoLog DEBUG "Linking '${_t}' -> '${t}'" - ln -sv "${t}" "${_t}" 2>&1 |CT_DoLog ALL + ln -sv "${t}" "${_t}" 2>&1 fi - done + done |CT_DoLog ALL CT_Popd CT_EndStep |