Applied change from Ben Nizette and Hans-Christian Egtvedt to

correctly detect version of gcc on recent distros.  Supplied
patch was against git and didn't apply cleanly to svn, so applied
by hand.

diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh
index 170f4372862746d2f8f2e2820fdfff1badcc3954..0e88d6967276d82de244dbd094ba6cdd6ccab586 100755 (executable)
--- a/toolchain/dependencies/dependencies.sh
+++ b/toolchain/dependencies/dependencies.sh
@@ -188,7 +188,8 @@ if [ -z "$COMPILER" ] ; then
        exit 1;
 fi;
 
-COMPILER_VERSION=$($COMPILER --version 2>&1 | $XSED -e 's/^.*(.CC) \([0-9\.]\)/\1/g' -e "s/[-\ ].*//g" -e '1q')
+COMPILER_VERSION=$($COMPILER -v 2>&1 | $XSED -n '/^gcc version/p' |
+       $XSED -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q')
 if [ -z "$COMPILER_VERSION" ] ; then
        echo "gcc installed:                FALSE"
        /bin/echo -e "\n\nYou must install 'gcc' on your build machine\n";
@@ -215,7 +216,8 @@ if [ -z "$CXXCOMPILER" ] ; then
        #exit 1
 fi
 if [ ! -z "$CXXCOMPILER" ] ; then
-       CXXCOMPILER_VERSION=$($CXXCOMPILER --version 2>&1 | $XSED -e 's/^.*(.CC) \([0-9\.]\)/\1/g' -e "s/[-\ ].*//g" -e '1q')
+       CXXCOMPILER_VERSION=$($CXXCOMPILER -v 2>&1 | $XSED -n '/^gcc version/p' |
+               $XSED -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q')
        if [ -z "$CXXCOMPILER_VERSION" ] ; then
                echo "c++ installed:                FALSE"
                /bin/echo -e "\nYou may have to install 'g++' on your build machine\n"