# HG changeset patch # User "Yann E. MORIN" # Date 1265293126 -3600 # Node ID ca5e7981fc24a715a43bbaf98972fa9dee4ed4ff # Parent da584d1d6ab803c0a2f7a9b53912426b69a8d322 cc/gcc: simplify the _or_later stuff diff -r da584d1d6ab8 -r ca5e7981fc24 config/cc/gcc.in --- a/config/cc/gcc.in Sun Feb 07 17:17:52 2010 +0100 +++ b/config/cc/gcc.in Thu Feb 04 15:18:46 2010 +0100 @@ -22,25 +22,21 @@ config CC_V_4_4_3 bool prompt "4.4.3" - select CC_GCC_4_3_or_later select CC_GCC_4_4_or_later config CC_V_4_4_2 bool prompt "4.4.2" - select CC_GCC_4_3_or_later select CC_GCC_4_4_or_later config CC_V_4_4_1 bool prompt "4.4.1" - select CC_GCC_4_3_or_later select CC_GCC_4_4_or_later config CC_V_4_4_0 bool prompt "4.4.0" - select CC_GCC_4_3_or_later select CC_GCC_4_4_or_later config CC_V_4_3_4 @@ -111,6 +107,7 @@ config CC_GCC_4_4_or_later bool default n + select CC_GCC_4_3_or_later select PPL_CLOOG_MPC config CC_VERSION diff -r da584d1d6ab8 -r ca5e7981fc24 scripts/addToolVersion.sh --- a/scripts/addToolVersion.sh Sun Feb 07 17:17:52 2010 +0100 +++ b/scripts/addToolVersion.sh Thu Feb 04 15:18:46 2010 +0100 @@ -100,12 +100,11 @@ 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)