diff options
author | unknown <msvensson@neptunus.(none)> | 2005-09-15 08:59:29 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2005-09-15 08:59:29 +0200 |
commit | 21e1efc75582e3f999e869190c625f409fe1c125 (patch) | |
tree | f6d096d508b013d29e5b34edf0be9d6097112ac6 /config | |
parent | 4f71165544f62521d9fd15d9d7fb4ae2911600c1 (diff) | |
download | mariadb-git-21e1efc75582e3f999e869190c625f409fe1c125.tar.gz |
Bug #12526 yassl: Crashes in "integer.cpp"
- Disable inlining in integer.cp for sparc solaris Cun C++ 5.6
config/ac-macros/yassl.m4:
Detect sparc Solaris + Sun C++ 5.6 and disable inlining for integer.cpp
extra/yassl/taocrypt/src/Makefile.am:
Compile integer.cpp into a separate lib in order to use special CXXFLAGS
Add the integer.cpp lib to libtaocrypt.la
Diffstat (limited to 'config')
-rw-r--r-- | config/ac-macros/yassl.m4 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index 92133339343..7af39db48be 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -20,6 +20,17 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt" openssl_includes="-I\$(top_srcdir)/extra/yassl/include" AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) + + # System specific checks + yassl_integer_extra_cxxflags="" + case $SYSTEM_TYPE--$CXX_VERSION in + sparc*solaris*--*Sun*C++*5.6*) + # Disable inlining when compiling taocrypt/src/integer.cpp + yassl_integer_extra_cxxflags="+d" + ;; + esac + AC_SUBST([yassl_integer_extra_cxxflags]) + else yassl_dir="" AC_MSG_RESULT(no) |