# HG changeset patch # User "Yann E. MORIN" # Date 1233514279 0 # Node ID 5c20d52c82702ebd1eb0b5f74ff389fe766f46ea # Parent a954ea1de05f2635fd18d3a6c45833a8a5276e72 Use tools discovered by ./configure in scripts/toolchain-config.in. /trunk/scripts/crosstool-NG.sh.in | 1 1 0 0 + /trunk/scripts/toolchain-config.in | 2 1 1 0 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff -r a954ea1de05f -r 5c20d52c8270 scripts/crosstool-NG.sh.in --- a/scripts/crosstool-NG.sh.in Sun Feb 01 18:43:45 2009 +0000 +++ b/scripts/crosstool-NG.sh.in Sun Feb 01 18:51:19 2009 +0000 @@ -412,6 +412,7 @@ CT_DoLog EXTRA "Installing user-supplied crosstool-NG configuration" CT_DoExecLog DEBUG install -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config" + CT_DoExecLog DEBUG sed -r -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config" bzip2 -c -9 .config >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config" CT_DoStep EXTRA "Dumping internal crosstool-NG configuration" diff -r a954ea1de05f -r 5c20d52c8270 scripts/toolchain-config.in --- a/scripts/toolchain-config.in Sun Feb 01 18:43:45 2009 +0000 +++ b/scripts/toolchain-config.in Sun Feb 01 18:51:19 2009 +0000 @@ -1,7 +1,7 @@ #!/bin/sh SKIP_ME="### CT_NG SKIP ME ###" -skip_me=$(($(cat "${0}" |grep --binary-files=text -o -b -E "^${SKIP_ME}$" |cut -d : -f 1)+${#SKIP_ME}+1)) +skip_me=$(($(cat "${0}" |@@grep@@ --binary-files=text -o -b -E "^${SKIP_ME}$" |cut -d : -f 1)+${#SKIP_ME}+1)) dd if="${0}" bs=${skip_me} skip=1 2>/dev/null |bzcat exit 0