summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBryan Hundven <bryanhundven@gmail.com>2016-01-06 05:45:48 (GMT)
committerBryan Hundven <bryanhundven@gmail.com>2016-01-06 05:45:48 (GMT)
commitce74282be4c62aa5b1626976c550dfce57023803 (patch)
tree073bc19a985312dbb91ec267ed9361f92aabfe97 /scripts
parent9375a9e41193a5af532c98ef1478ab122170bad8 (diff)
parent91520c2b368b02a9084ae3b11d273b99fc0bef46 (diff)
Merge pull request #309 from bhundven/remove_old_binutils_versions
Remove old binutils versions
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/addToolVersion.sh22
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
index 0144e4f..b35ad0c 100755
--- a/scripts/addToolVersion.sh
+++ b/scripts/addToolVersion.sh
@@ -117,19 +117,19 @@ addToolVersion() {
fi
;;
binutils)
- # Extract 'M'ajor and 'm'inor from version string
+ # Extract 'M'ajor, 'm'inor, sometimes 'p'atch from version string
+ # TODO: Rework this
ver_M=$(getVersionField "${version}" . 1)
ver_m=$(getVersionField "${version}" . 2)
- if [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 22 \) ]; then
- SedExpr1="${SedExpr1}\n select BINUTILS_2_22_or_later"
- elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 21 \) ]; then
- SedExpr1="${SedExpr1}\n select BINUTILS_2_21_or_later"
- elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 20 \) ]; then
- SedExpr1="${SedExpr1}\n select BINUTILS_2_20_or_later"
- elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 19 \) ]; then
- SedExpr1="${SedExpr1}\n select BINUTILS_2_19_or_later"
- elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 18 \) ]; then
- SedExpr1="${SedExpr1}\n select BINUTILS_2_18_or_later"
+ ver_p=$(getVersionField "${version}" . 3)
+ if [ ${ver_M} -eq 2 -a ${ver_m} -eq 25 -a ${ver_p} -eq 1 ]; then
+ SedExpr1="${SedExpr1}\n select BINUTILS_2_25_1_or_later"
+ elif [ ${ver_M} -eq 2 -a ${ver_m} -eq 25 -a -z ${ver_p} ]; then
+ SedExpr1="${SedExpr1}\n select BINUTILS_2_25_or_later"
+ elif [ ${ver_M} -eq 2 -a ${ver_m} -eq 24 ]; then
+ SedExpr1="${SedExpr1}\n select BINUTILS_2_24_or_later"
+ elif [ ${ver_M} -eq 2 -a ${ver_m} -eq 23 -a ${ver_p} -eq 2 ]; then
+ SedExpr1="${SedExpr1}\n select BINUTILS_2_23_2_or_later"
fi
;;
uClibc)