Просмотр исходного кода

- 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

Bernhard Reutner-Fischer 18 лет назад
Родитель
Сommit
784e010f2d
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      toolchain/dependencies/dependencies.mk
  2. 2 2
      toolchain/dependencies/dependencies.sh

+ 1 - 1
toolchain/dependencies/dependencies.mk

@@ -6,7 +6,7 @@
 ######################################################################
 
 dependencies: host-sed
-	@$(TOPDIR)/toolchain/dependencies/dependencies.sh
+	@HOSTCC="$(firstword $(HOSTCC))" $(TOPDIR)/toolchain/dependencies/dependencies.sh
 
 dependencies-source:
 

+ 2 - 2
toolchain/dependencies/dependencies.sh

@@ -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";