summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-02-01 22:41:16 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-02-01 22:41:16 (GMT)
commit8eed91405edf07a8f25c5ee4825751af7d392b7e (patch)
treef4404b56feba0762d4b9d965bb9c4f8a3b49a2fc /scripts
parent692749b67ea6ad54493eda4acf4285c4a50eadec (diff)
Fix populate to correctly use tools discovered via ./configure.
/trunk/scripts/functions | 11 8 3 0 ++++++++--- /trunk/scripts/populate.in | 6 4 2 0 ++++-- 2 files changed, 12 insertions(+), 5 deletions(-)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/functions11
-rw-r--r--scripts/populate.in6
2 files changed, 12 insertions, 5 deletions
diff --git a/scripts/functions b/scripts/functions
index d110f4d..2e10641 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -905,9 +905,14 @@ do_finish() {
if [ "${CT_BARE_METAL}" != "y" ]; then
CT_DoLog EXTRA "Installing the populate helper"
- sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \
- -e 's|@@CT_bash@@|'"${bash}"'|g;' \
- "${CT_LIB_DIR}/scripts/populate.in" \
+ sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \
+ -e 's|@@CT_install@@|'"${install}"'|g;' \
+ -e 's|@@CT_bash@@|'"${bash}"'|g;' \
+ -e 's|@@CT_grep@@|'"${grep}"'|g;' \
+ -e 's|@@CT_make@@|'"${make}"'|g;' \
+ -e 's|@@CT_awk@@|'"${awk}"'|g;' \
+ -e 's|@@CT_sed@@|'"${sed}"'|g;' \
+ "${CT_LIB_DIR}/scripts/populate.in" \
>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
CT_DoExecLog ALL chmod 755 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
fi
diff --git a/scripts/populate.in b/scripts/populate.in
index 6615811..e8a3718 100644
--- a/scripts/populate.in
+++ b/scripts/populate.in
@@ -13,8 +13,10 @@ CT_SYSROOT_DIR="$(cd "${CT_BIN_DIR}/../@@CT_TARGET@@/sys-root"; pwd)"
myname=$(basename "$0")
-# Parse the tools' paths configuration
-. "${CT_LIB_DIR}/paths.mk"
+# Use the tols discovered by crosstool-NG's ./configure:
+install="@@CT_install@@"
+grep="@@CT_grep@@"
+sed="@@CT_sed@@"
doHelp() {
cat <<_EOF_