diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-12-12 11:04:13 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-12-12 11:04:13 -0600 |
| commit | 6d1a08d951f3142833d30f9835a3889288e5d886 (patch) | |
| tree | 8d53216e91b4b3efaac5b7da116b05ab74362202 /misc | |
| parent | 3f8f38dee927d2c5fae0b674df10fe39f089a7ea (diff) | |
| download | nuttx-6d1a08d951f3142833d30f9835a3889288e5d886.tar.gz nuttx-6d1a08d951f3142833d30f9835a3889288e5d886.tar.bz2 nuttx-6d1a08d951f3142833d30f9835a3889288e5d886.zip | |
Fix for building on Ubuntu from Oliver Riesener
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/buildroot/ChangeLog | 4 | ||||
| -rwxr-xr-x | misc/buildroot/toolchain/dependencies/dependencies.sh | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/misc/buildroot/ChangeLog b/misc/buildroot/ChangeLog index b77808e93..4ba06a8f0 100644 --- a/misc/buildroot/ChangeLog +++ b/misc/buildroot/ChangeLog @@ -135,3 +135,7 @@ buildroot-1.12 2013-03-15 <gnutt@nuttx.org> buildroot-1.13 2011-xx-xx <gnutt@nuttx.org> + * Ubuntu's HOSTCC prints 'gcc-Version 4.6.3' but dependencies.sh expects + 'gcc version 4.6.3'. This changes solves the issue, but should be + revisited at some time. From Oliver Riesener (2013-12-12). + diff --git a/misc/buildroot/toolchain/dependencies/dependencies.sh b/misc/buildroot/toolchain/dependencies/dependencies.sh index de0d187bd..c03daaa5c 100755 --- a/misc/buildroot/toolchain/dependencies/dependencies.sh +++ b/misc/buildroot/toolchain/dependencies/dependencies.sh @@ -192,8 +192,8 @@ if [ -z "$COMPILER" ] ; then exit 1 fi -COMPILER_VERSION=$($COMPILER -v 2>&1 | $SED -n '/^gcc version/p' | - $SED -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') +COMPILER_VERSION=$($COMPILER -v 2>&1 | $SED -n '/^gcc..ersion/p' | + $SED -e 's/^gcc..ersion \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') if [ -z "$COMPILER_VERSION" ] ; then echo "gcc installed: FALSE" echo "" @@ -227,8 +227,8 @@ if [ -z "$CXXCOMPILER" ] ; then fi if [ ! -z "$CXXCOMPILER" ] ; then - CXXCOMPILER_VERSION=$($CXXCOMPILER -v 2>&1 | $SED -n '/^gcc version/p' | - $SED -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') + CXXCOMPILER_VERSION=$($CXXCOMPILER -v 2>&1 | $SED -n '/^gcc..ersion/p' | + $SED -e 's/^gcc..ersion \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') if [ -z "$CXXCOMPILER_VERSION" ] ; then echo "c++ installed: FALSE" echo "" |