summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-10-20 13:02:24 +0300
committerTor Lillqvist <tml@iki.fi>2011-10-20 13:03:16 +0300
commit15597b7bd7eaa533989756edc0b04258470922e4 (patch)
tree47737b8bf0a0b5e96d328db3b2d6868b75449fe2
parent625a032f820234b0d55e44b2263c5847993dcc7d (diff)
Use -Wno-array-bounds only on gcc versions (4.3..4.4.3)
-rw-r--r--basegfx/Library_basegfx.mk5
-rw-r--r--basegfx/StaticLibrary_basegfx_s.mk5
2 files changed, 6 insertions, 4 deletions
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 41e1691dcbb5..022c436a0e24 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 27a51d104bed..9999e5c2fb8d 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 \
))