From d1607dc7dfc2c5397ff6b67ebd18d25c6184f650 Mon Sep 17 00:00:00 2001 From: Jens Stimpfle Date: Wed, 12 Nov 2014 13:31:44 +0000 Subject: [PATCH] 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 Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index af5ce0e54..44e212dd2 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