diff options
| -rw-r--r-- | scripts/functions | 11 | ||||
| -rw-r--r-- | scripts/populate.in | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/scripts/functions b/scripts/functions index d110f4dd..2e10641e 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 66158117..e8a3718a 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_ |