mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-09 07:51:59 -09:00
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.
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user