Fix addToolVersion.sh after breakage with support for gcc-4.3 (stupid anyway...).

 /trunk/tools/addToolVersion.sh |   18    10     8     0 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

1 files changed, 10 insertions, 8 deletions

diff --git a/tools/addToolVersion.sh b/tools/addToolVersion.sh
index e158575..3dea149 100755
--- a/tools/addToolVersion.sh
+++ b/tools/addToolVersion.sh
@@ -81,10 +81,10 @@ esac
 
 for ver in ${VERSION}; do
     # Split VERSION into MAJOR MINOR PATCHLEVEL EXTRAVERSION 
-    VERSION_M=$(echo "${VERSION}...." |cut -d . -f 1)
-    VERSION_m=$(echo "${VERSION}...." |cut -d . -f 2)
-    VERSION_P=$(echo "${VERSION}...." |cut -d . -f 3)
-    VERSION_E=$(echo "${VERSION}...." |cut -d . -f 4)
+    ver_M=$(echo "${ver}...." |cut -d . -f 1)
+    ver_m=$(echo "${ver}...." |cut -d . -f 2)
+    ver_P=$(echo "${ver}...." |cut -d . -f 3)
+    ver_E=$(echo "${ver}...." |cut -d . -f 4)
     unset DEP L1 L2 L3 L4 L5 L6 FILE
     v=$(echo "${ver}" |sed -r -e 's/-/_/g; s/\./_/g;')
     if [ "${cat}" = "KERNEL" ]; then
@@ -97,7 +97,7 @@ for ver in ${VERSION}; do
             sanitised,*)    ;; # Sanitised headers always have an extra version
             *,*.*.*.*)      DEP="${DEP} && KERNEL_VERSION_SEE_EXTRAVERSION";;
         esac
-        L5="    default \"${ver}\" if ${cat}_${TOOL_SUFFIX}_V_${v}"
+        L6="    default \"${ver}\" if ${cat}_${TOOL_SUFFIX}_V_${v}"
         FILE="config/${tool_prefix}/${tool}_headers_${tool_suffix}.in"
     else
         L1="config ${cat}_V_${v}\n"
@@ -106,8 +106,8 @@ for ver in ${VERSION}; do
         L6="    default \"${ver}\" if ${cat}_V_${v}"
         case "${tool}" in
             gcc)
-                if [ ${VERSION_M} -gt 4 -o \( ${VERSION_M} -eq 4 -a ${VERSION_m} -gret 3 i\) ]; then
-                    L5="    select CC_GCC_4_3_or_later"
+                if [ ${ver_M} -gt 4 -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then
+                    L5="    select CC_GCC_4_3_or_later\n"
                 fi
                 ;;
         esac
@@ -115,10 +115,12 @@ for ver in ${VERSION}; do
     fi
     [ -n "${EXP}" ] && DEP="${DEP} && EXPERIMENTAL"
     [ -n "${OBS}" ] && DEP="${DEP} && OBSOLETE"
+    echo "${DEP}"
     case "${DEP}" in
         "") ;;
-        *)  L4="    depends on "$(echo "${DEP}" |sed -r -e 's/^ \\&\\& //; s/\\&/\\\\&/g;')"\n"
+        *)  L4="    depends on "$(echo "${DEP}" |sed -r -e 's/^ \&\& //; s/\&/\\&/g;')"\n"
     esac
+    echo "${L4}"
     sed -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${L1}${L2}${L3}${L4}${L5}"'\n\1/;
                   s/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${L6}"'\n\1/;' "${FILE}"
 done