Fix problem with gcc on some computers (where 'gcc -dumpversion' prints something...

diff --git a/config_files/gcc-3.2.sh b/config_files/gcc-3.2.sh
index 3d8b9b48de1554b67c58aad1db51722cacac48c7..abb463cce7df2ad027f6b11967a9ea40e037c611 100755 (executable)
--- a/config_files/gcc-3.2.sh
+++ b/config_files/gcc-3.2.sh
@@ -3,7 +3,7 @@
 check_version(){
 # version number is calculated as: <major>*10000+<minor>*100+<release>
 # e.g. for gcc 3.2 it is equal to 30200, for gcc 3.3.2 - 30202
-gcc_ver=`gcc -dumpversion | awk -F. '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'`
+gcc_ver=`gcc -dumpversion | awk -F[.-] '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'`
 if [ $gcc_ver -eq 30200 ]  ; then
     return 0
 fi
@@ -33,9 +33,9 @@ if [ -n "${gcc_root}" ] ; then
     # <major> and <minor> numbers are checked strickly, but <release> number can be larger than required one
     # version number is calculated as: <major>*10000+<minor>*100+<release>
     # e.g. for gcc 3.2 it is equal to 30200, for gcc 3.3.2 - 30202
-    maj_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F. '{if(NF>0) print $1; else print 0}'`
-    min_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F. '{if(NF>1) print $2; else print 0}'`
-    rel_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F. '{if(NF>2) print $3; else print 0}'`
+    maj_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>0) print $1; else print 0}'`
+    min_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>1) print $2; else print 0}'`
+    rel_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>2) print $3; else print 0}'`
     let gcc_ver=$maj_ver*10000+$min_ver*100+$rel_ver
     if [ $gcc_ver -ge 30200 ]  ; then
        tmp="\${GCC_ROOT}/bin ${gcc_root}/bin \${PATH} ${PATH}";  

diff --git a/config_files/gcc-3.4.sh b/config_files/gcc-3.4.sh
index eac3103caba5183e7d84b71cac2915d66ae75303..ce76d4d6a94bab8aebae57d384b42ba8b6487686 100755 (executable)
--- a/config_files/gcc-3.4.sh
+++ b/config_files/gcc-3.4.sh
@@ -3,7 +3,7 @@
 check_version(){
 # version number is calculated as: <major>*10000+<minor>*100+<release>
 # e.g. for gcc 3.2 it is equal to 30200, for gcc 3.4.1 - 30401
-gcc_ver=`gcc -dumpversion | awk -F. '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'`
+gcc_ver=`gcc -dumpversion | awk -F[.-] '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'`
 if [ $gcc_ver -eq 30401 ]  ; then
     return 0
 fi
@@ -33,9 +33,9 @@ if [ -n "${gcc_root}" ] ; then
     # <major> and <minor> numbers are checked strickly, but <release> number can be larger than required one
     # version number is calculated as: <major>*10000+<minor>*100+<release>
     # e.g. for gcc 3.2 it is equal to 30200, for gcc 3.4.1 - 30401
-    maj_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F. '{if(NF>0) print $1; else print 0}'`
-    min_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F. '{if(NF>1) print $2; else print 0}'`
-    rel_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F. '{if(NF>2) print $3; else print 0}'`
+    maj_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>0) print $1; else print 0}'`
+    min_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>1) print $2; else print 0}'`
+    rel_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>2) print $3; else print 0}'`
     let gcc_ver=$maj_ver*10000+$min_ver*100+$rel_ver
     if [ $gcc_ver -ge 30401 ]  ; then
        tmp="\${GCC_ROOT}/bin ${gcc_root}/bin \${PATH} ${PATH}";