mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-02-21 01:21:27 +00:00
Use the path discovered by ./configure in scripts/addToolVersion.sh
It now requires that "./configure && make" be run beforehand. /trunk/scripts/addToolVersion.sh | 10 7 3 0 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
This commit is contained in:
parent
fcd59328f4
commit
1b05494c83
@ -1,8 +1,12 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
# Adds a new version to one of the toolchain component
|
||||
myname="$0"
|
||||
|
||||
# Parse the tools' paths configuration
|
||||
. "paths.mk"
|
||||
|
||||
doHelp() {
|
||||
cat <<-EOF
|
||||
Usage: ${myname} <tool> <[options] version [...]> ...
|
||||
@ -53,7 +57,7 @@ addToolVersion() {
|
||||
local SedExpr1 SedExpr2
|
||||
|
||||
file="config/${tool_prefix}/${tool}.in"
|
||||
v=$(echo "${version}" |sed -r -e 's/-/_/g; s/\./_/g;')
|
||||
v=$(echo "${version}" |"${sed}" -r -e 's/-/_/g; s/\./_/g;')
|
||||
|
||||
SedExpr1="${SedExpr1}config ${cat}_V_${v}\n"
|
||||
SedExpr1="${SedExpr1} bool\n"
|
||||
@ -83,8 +87,8 @@ addToolVersion() {
|
||||
fi
|
||||
fi
|
||||
SedExpr2=" default \"${version}\" if ${cat}_V_${v}"
|
||||
sed -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${SedExpr1}"'\n\1/;' "${file}"
|
||||
sed -r -i -e 's/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${SedExpr2}"'\n\1/;' "${file}"
|
||||
"${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${SedExpr1}"'\n\1/;' "${file}"
|
||||
"${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${SedExpr2}"'\n\1/;' "${file}"
|
||||
}
|
||||
|
||||
cat=
|
||||
|
Loading…
x
Reference in New Issue
Block a user