diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-08-09 18:03:02 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-08-09 18:03:02 (GMT) |
| commit | ee225f2629d5059fd3960c5b930b3615fc1af9f3 (patch) | |
| tree | 2f8b5ce9d63757cc61d7d26bbe83aadf6ec9eda1 /tools | |
| parent | 64dd9107e4240e4c7ce3d1aae75d1e916732e2f6 (diff) | |
Merge #893 and #923 from trunk:
populate is not relocatable.
/branches/1.2/scripts/crosstool.sh | 14 6 8 0 ++++++--------
/branches/1.2/tools/populate.in | 6 4 2 0 ++++--
2 files changed, 10 insertions(+), 10 deletions(-)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/populate.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/populate.in b/tools/populate.in index 7c27f39..00c0c75 100644 --- a/tools/populate.in +++ b/tools/populate.in @@ -4,8 +4,10 @@ # (C) 2007 Yann E. MORIN # Licensed under the GPL v2 -CT_READELF="@@CT_READELF@@" -CT_SYSROOT_DIR="@@CT_SYSROOT_DIR@@" +# Detect where the toolchain is: +BIN_DIR="$(cd "$(dirname "$(readlink -fn "$0")")"; pwd)" +CT_READELF="${BIN_DIR}/@@CT_TARGET@@-readelf" +CT_SYSROOT_DIR="${BIN_DIR}/../@@CT_TARGET@@/sys-root" myname=$(basename "$0") |