From 933404b4492264018b40228dfa79ea2ccee30bbd Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Thu, 4 Feb 2010 15:18:46 +0100
Subject: cc/gcc: simplify the _or_later stuff


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)
-- 
cgit v0.10.2-6-g49f6