gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix parsing the gcc version. Also look at the HOSTCC's version rather than a random gcc that may be installed.

Browse Source 
Closes #961 and #1097
This commit is contained in:
Bernhard Reutner-Fischer 2006-11-28 10:06:48 +00:00
parent 085f7b3ed9
commit 784e010f2d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolchain/dependencies/dependencies.mk
View File

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

4
toolchain/dependencies/dependencies.sh
View File

@ -61,7 +61,7 @@ echo "GNU make version '$MAKE_VERSION': Ok"
# check build system 'gcc' # check build system 'gcc'
# #
############################################################# #############################################################
COMPILER=$(which gcc) COMPILER=$(which $HOSTCC)
if [ -z "$COMPILER" ] ; then if [ -z "$COMPILER" ] ; then
COMPILER=$(which cc) COMPILER=$(which cc)
if [ -z "$COMPILER" ] ; then if [ -z "$COMPILER" ] ; then
@ -70,7 +70,7 @@ if [ -z "$COMPILER" ] ; then
exit 1; exit 1;
fi; fi;
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 if [ -z "$COMPILER_VERSION" ] ; then
echo "gcc installed: FALSE" echo "gcc installed: FALSE"
echo -e "\n\nYou must install 'gcc' on your build machine\n"; echo -e "\n\nYou must install 'gcc' on your build machine\n";