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

Applied change from Ben Nizette and Hans-Christian Egtvedt to

Browse Source 
correctly detect version of gcc on recent distros.  Supplied 
patch was against git and didn't apply cleanly to svn, so applied 
by hand.
This commit is contained in:
Hamish Moffatt 2008-09-04 02:30:56 +00:00
parent d74a92e00c
commit ea8e74bcbe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolchain/dependencies/dependencies.sh
View File

@ -188,7 +188,8 @@ if [ -z "$COMPILER" ] ; then
exit 1; exit 1;
fi; 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 if [ -z "$COMPILER_VERSION" ] ; then
echo "gcc installed: FALSE" echo "gcc installed: FALSE"
/bin/echo -e "\n\nYou must install 'gcc' on your build machine\n"; /bin/echo -e "\n\nYou must install 'gcc' on your build machine\n";
@ -215,7 +216,8 @@ if [ -z "$CXXCOMPILER" ] ; then
#exit 1 #exit 1
fi fi
if [ ! -z "$CXXCOMPILER" ] ; then 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 if [ -z "$CXXCOMPILER_VERSION" ] ; then
echo "c++ installed: FALSE" echo "c++ installed: FALSE"
/bin/echo -e "\nYou may have to install 'g++' on your build machine\n" /bin/echo -e "\nYou may have to install 'g++' on your build machine\n"