Commit ea8e74bc authored by Hamish Moffatt's avatar Hamish Moffatt
Browse files

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.
parent d74a92e0

toolchain/dependencies/dependencies.sh

+4 −2
Original line number Diff line number Diff line
@@ -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"