From 933404b4492264018b40228dfa79ea2ccee30bbd Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Thu, 4 Feb 2010 15:18:46 +0100 Subject: cc/gcc: simplify the _or_later stuff --- scripts/addToolVersion.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'scripts/addToolVersion.sh') diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index ba373eee..7fd43076 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -99,13 +99,12 @@ addToolVersion() { # Extract 'M'ajor and 'm'inor from version string ver_M=$(echo "${version}...." |cut -d . -f 1) ver_m=$(echo "${version}...." |cut -d . -f 2) - if [ ${ver_M} -gt 4 \ - -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_3_or_later" - fi if [ ${ver_M} -gt 4 \ -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 4 \) ]; then SedExpr1="${SedExpr1}\n select CC_GCC_4_4_or_later" + elif [ ${ver_M} -gt 4 \ + -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then + SedExpr1="${SedExpr1}\n select CC_GCC_4_3_or_later" fi ;; uClibc) -- cgit v1.2.3