Commit 784e010f authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- fix parsing the gcc version. Also look at the HOSTCC's version rather than a... 

- fix parsing the gcc version. Also look at the HOSTCC's version rather than a random gcc that may be installed.
  Closes #961 and #1097
parent 085f7b3e

toolchain/dependencies/dependencies.mk

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
######################################################################



dependencies: host-sed

	@$(TOPDIR)/toolchain/dependencies/dependencies.sh

	@HOSTCC="$(firstword $(HOSTCC))" $(TOPDIR)/toolchain/dependencies/dependencies.sh



dependencies-source:

toolchain/dependencies/dependencies.sh

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ echo "GNU make version '$MAKE_VERSION': Ok" 
# check build system 'gcc'

#

#############################################################

COMPILER=$(which gcc)

COMPILER=$(which $HOSTCC)

if [ -z "$COMPILER" ] ; then

	COMPILER=$(which cc)

	if [ -z "$COMPILER" ] ; then
@@ -70,7 +70,7 @@ if [ -z "$COMPILER" ] ; then 
		exit 1;

	fi;

fi;

COMPILER_VERSION=$($COMPILER --version 2>&1 | head -n1 | $XSED -e 's/^.* \([0-9\.]\)/\1/g' -e "s/[-\ ].*//g")

COMPILER_VERSION=$($COMPILER --version 2>&1 | head -n1 | $XSED -e 's/^.*(.CC) \([0-9\.]\)/\1/g' -e "s/[-\ ].*//g")

if [ -z "$COMPILER_VERSION" ] ; then

	echo "gcc installed:		    FALSE"

	echo -e "\n\nYou must install 'gcc' on your build machine\n";