[Libreoffice-commits] .: basegfx/Library_basegfx.mk basegfx/StaticLibrary_basegfx_s.mk

[Tor Lillqvist]

 basegfx/Library_basegfx.mk         |    5 +++--
 basegfx/StaticLibrary_basegfx_s.mk |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 15597b7bd7eaa533989756edc0b04258470922e4
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Oct 20 13:02:24 2011 +0300

    Use -Wno-array-bounds only on gcc versions (4.3..4.4.3)

diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 41e1691..022c436 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -44,9 +44,10 @@ $(eval $(call gb_Library_add_defs,basegfx,\
 ))
 
 # Work around gcc bug 41847 present at least in 
-# the Android x-compiler 4.4.3
+# the Android x-compiler 4.4.3.
+# -Warray-bounds appeared in 4.3
 ifeq ($(COM),GCC)
-ifeq ($(shell expr $(gb_CCVER) \<= 40403),1)
+ifeq ($(shell expr \( $(gb_CCVER) \>= 40300 \) \& \( $(gb_CCVER) \<= 40403 \)),1)
 $(eval $(call gb_Library_add_cxxflags,basegfx,\
 	-Wno-array-bounds \
 ))
diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk
index 27a51d1..9999e5c 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -41,9 +41,10 @@ $(eval $(call gb_StaticLibrary_set_include,basegfx_s,\
 ))
 
 # Work around gcc bug 41847 present at least in 
-# the Android x-compiler 4.4.3
+# the Android x-compiler 4.4.3.
+# -Warray-bounds appeared in 4.3
 ifeq ($(COM),GCC)
-ifeq ($(shell expr $(gb_CCVER) \<= 40403),1)
+ifeq ($(shell expr \( $(gb_CCVER) \>= 40300 \) \& \( $(gb_CCVER) \<= 40403 \)),1)
 $(eval $(call gb_StaticLibrary_add_cxxflags,basegfx_s,\
 	-Wno-array-bounds \
 ))