From 7bcf18bfab84374d3305c7a088f95ac1219ddf93 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 12 Feb 2017 18:53:23 -0800 Subject: Determine whether -E/-r option selects extended regexp ... and then use the right option. See the note in scripts/functions on where we should use ${foo} and where just 'foo'; this boils down to whether we can expect the build tools override to be in effect (e.g. in the actual build scripts) or not (i.e. outside of scripts/build). While running in scripts/functions, or in scripts/crosstool-NG.sh the build tools override directory (.build/tools/bin) may have not been set up (yet, or at all). Also, modify the installed scripts (populate, xldd) accordingly. Signed-off-by: Alexey Neyman --- scripts/addToolVersion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/addToolVersion.sh') diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index dbd12439..cf2b5945 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -73,7 +73,7 @@ addToolVersion() { [ -f "${file}" ] || return 0 - v=$(echo "${version}" |"${sed}" -r -e 's/-/_/g; s/\./_/g;') + v=$(echo "${version}" |"${sed_r}" -e 's/-/_/g; s/\./_/g;') config_ver_option="${cat}_V_${v}" -- cgit v1.2.3