From 022dc5e094fb42af68f48da786d4b2db56aaa916 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Sat, 19 Jul 2014 02:52:08 -0400 Subject: scripts/addToolVersion: simpily gcc handling and fix for gcc-4.9.X (and later) Signed-off-by: Cody P Schafer 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) -- cgit v0.10.2-6-g49f6