Recent changes from 0.9.6-stable.

1 files changed, 5 insertions, 3 deletions

diff --git a/config b/config
index b95af94c7a..f619e3463b 100755
--- a/config
+++ b/config
@@ -381,11 +381,13 @@ done
 
 # figure out if gcc is available and if so we use it otherwise
 # we fallback to whatever cc does on the system
-GCCVER=`(gcc --version) 2>/dev/null`
+GCCVER=`(gcc --version) 2>/dev/null | head -1`
 if [ "$GCCVER" != "" ]; then
   CC=gcc
-  # then strip off whatever prefix Cygnus prepends the number with...
-  GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'`
+  # then strip off whatever prefix Cygnus as well as GCC 3.1 prepends
+  # the number with...  Hopefully, this will work for any future prefixes
+  # as well.
+  GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z ()]*\-//'`
   # peak single digit before and after first dot, e.g. 2.95.1 gives 29
   GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
 else