aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Avtalion2010-04-09 12:30:45 +0000
committerOri Avtalion2010-04-09 12:30:45 +0000
commitbe31842b1c2e08106b3fc829b0c5304c7f7e96d7 (patch)
tree951ff38733fafcbad4884b4df106231631d1116c
parentf2f0e1aa67dda73aeba9caa6dd62edbfbf992947 (diff)
downloadscummvm-rg350-be31842b1c2e08106b3fc829b0c5304c7f7e96d7.tar.gz
scummvm-rg350-be31842b1c2e08106b3fc829b0c5304c7f7e96d7.tar.bz2
scummvm-rg350-be31842b1c2e08106b3fc829b0c5304c7f7e96d7.zip
Future-proof gcc >= 4.3 test (Will break on version 5.0)
svn-id: r48595
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 2f6edb933e..b44288727c 100755
--- a/configure
+++ b/configure
@@ -2370,7 +2370,8 @@ if test "$have_gcc" = yes ; then
add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
fi;
- if test "$_cxx_major" -ge "4" && test "$_cxx_minor" -ge "3" ; then
+ if test "$_cxx_major" -eq 4 && test "$_cxx_minor" -ge 3 || \
+ test "$_cxx_major" -gt 4 ; then
CXXFLAGS="$CXXFLAGS -Wno-empty-body"
else
CXXFLAGS="$CXXFLAGS -Wconversion"