diff options
| -rw-r--r-- | config/cc/gcc.in | 5 | ||||
| -rwxr-xr-x | scripts/addToolVersion.sh | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index a4f8a4e..cbb16ab 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -22,25 +22,21 @@ choice 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_3_or_later 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 --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index ba373ee..7fd4307 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -100,12 +100,11 @@ addToolVersion() { 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) |