diff options
| author |   Cody P Schafer <dev@codyps.com> | 2014-07-19 06:52:08 (GMT) |
|---|---|---|
| committer |   Yann E. MORIN <yann.morin.1998@free.fr> | 2014-07-19 10:23:02 (GMT) |
| commit | 022dc5e094fb42af68f48da786d4b2db56aaa916 (patch) | |
| tree | 6cea45e203d4ff03f1f381e0ec3949ff44315949 /scripts | |
| parent | 6b1a2304821ab303cd84c22cd039eab0289d9e60 (diff) | |
scripts/addToolVersion: simpily gcc handling and fix for gcc-4.9.X (and later)
Signed-off-by: Cody P Schafer <dev@codyps.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/addToolVersion.sh | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index fe67c2d..34f42eb 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -111,20 +111,8 @@ addToolVersion() { # Extract 'M'ajor and 'm'inor from version string ver_M=$(getVersionField "${version}" . 1) ver_m=$(getVersionField "${version}" . 2) - if [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 8 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_8" - elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 7 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_7" - elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 6 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_6" - elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 5 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_5" - elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 4 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_4" - elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 3 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_3" - elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 2 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_2" + if [ ${ver_M} -ge 4 ] && [ ${ver_m} -ge 2 ]; then + SedExpr1="${SedExpr1}\n select CC_GCC_${ver_M}_${ver_m}" fi ;; binutils) |