diff options
| author | Jens Stimpfle <debian@jstimpfle.de> | 2014-11-12 13:31:44 +0000 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-12-08 22:32:21 +0100 |
| commit | d1607dc7dfc2c5397ff6b67ebd18d25c6184f650 (patch) | |
| tree | 0835329120cbb8928eef07c1d3682b80186dd6b9 /support/dependencies | |
| parent | 66056a5179ef49f2ec10ba5d7fbd1a58863d1350 (diff) | |
| download | buildroot-d1607dc7dfc2c5397ff6b67ebd18d25c6184f650.tar.gz buildroot-d1607dc7dfc2c5397ff6b67ebd18d25c6184f650.zip | |
support/scripts/dependencies.sh: improve g++ test to avoid misleading output
When g++ is not installed, a misleading error message turns up because
of a bad combination of an unquoted shell variable and control flow.
~/buildroot$ make
You may have to install 'g++' on your build machine
/home/testuser/buildroot/support/dependencies/dependencies.sh: 136: [: -lt: unexpected operator
[Thomas:
- fixed commit log, as per the suggestion of Yann E. Morin.
- don't change existing empty new lines, suggested by Yann.
- use positive logic in the newly added test, suggested by Yann.]
Signed-off-by: Jens Stimpfle <debian@jstimpfle.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'support/dependencies')
| -rwxr-xr-x | support/dependencies/dependencies.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index af5ce0e544..44e212dd2c 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -133,7 +133,9 @@ if [ ! -z "$CXXCOMPILER" ] ; then echo echo "You may have to install 'g++' on your build machine" fi +fi +if [ -n "$CXXCOMPILER_VERSION" ] ; then CXXCOMPILER_MAJOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/\..*//g") CXXCOMPILER_MINOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/^$CXXCOMPILER_MAJOR\.//g" -e "s/\..*//g") if [ $CXXCOMPILER_MAJOR -lt 3 -o $CXXCOMPILER_MAJOR -eq 2 -a $CXXCOMPILER_MINOR -lt 95 ] ; then |
