summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-06 18:27:13 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-06 18:27:13 -0300
commit53816be2596069a6eaf7545907d69c8817dd5d5f (patch)
tree3aa2e644cffbe56aed431b6bf8396b0299a18e79 /configure.in
parent99b51569fd28c1555cdc8e428129a1b72dbd5b4c (diff)
parent04dd8ed0eb5f06f670f6e455b06c1173988a8f11 (diff)
downloadmariadb-git-53816be2596069a6eaf7545907d69c8817dd5d5f.tar.gz
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in11
1 files changed, 10 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index b07f172e758..2000da66a36 100644
--- a/configure.in
+++ b/configure.in
@@ -506,7 +506,16 @@ if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
then
ABI_CHECK=""
else
- ABI_CHECK="abi_check"
+ # Workaround GCC >= 4.5 - See Bug#52514
+ case `$CC -dumpversion` in
+ [[4-9]].[[5-9]]*)
+ AC_MSG_WARN([ABI check disabled (GCC >= 4.5)])
+ ABI_CHECK=""
+ ;;
+ *)
+ ABI_CHECK="abi_check"
+ ;;
+ esac
fi
AC_SUBST(ABI_CHECK)