mirror of
https://github.com/MariaDB/server.git
synced 2026-04-24 09:15:30 +02:00
gcc 2.92 compatibility
config/ac-macros/misc.m4: better USE_MYSYS_NEW detection configure.in: better USE_MYSYS_NEW detection extra/yassl/src/Makefile.am: better USE_MYSYS_NEW detection extra/yassl/taocrypt/include/runtime.hpp: better USE_MYSYS_NEW detection
This commit is contained in:
parent
a001bb2b9d
commit
cba5abe650
9 changed files with 52 additions and 54 deletions
27
configure.in
27
configure.in
|
|
@ -336,32 +336,6 @@ AC_SUBST(LD)
|
|||
AC_SUBST(INSTALL_SCRIPT)
|
||||
|
||||
export CC CXX CFLAGS LD LDFLAGS AR
|
||||
if test "$GXX" = "yes"
|
||||
then
|
||||
# mysqld requires -fno-implicit-templates.
|
||||
# Disable exceptions as they seams to create problems with gcc and threads.
|
||||
# mysqld doesn't use run-time-type-checking, so we disable it.
|
||||
CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"
|
||||
|
||||
CXX_VERNO=`echo $CXX_VERSION | sed -e 's/[[^0-9. ]]//g; s/^ *//g; s/ .*//g'`
|
||||
case "$CXX_VERNO" in
|
||||
3.*)
|
||||
USE_MYSYS_NEW="-DUSE_MYSYS_NEW" # yassl needs it
|
||||
if echo $CXX | grep gcc > /dev/null 2>&1
|
||||
then
|
||||
# If you are using 'gcc' 3.0 (not g++) to compile C++ programs on Linux,
|
||||
# we will gets some problems when linking static programs.
|
||||
# The following code is used to fix this problem.
|
||||
CXXFLAGS="$CXXFLAGS $USE_MYSYS_NEW"
|
||||
AC_MSG_WARN([Using MYSYS_NEW for static linking with gcc])
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
USE_MYSYS_NEW=""
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(USE_MYSYS_NEW)
|
||||
fi
|
||||
|
||||
# Avoid bug in fcntl on some versions of linux
|
||||
AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os")
|
||||
|
|
@ -1730,6 +1704,7 @@ AC_TYPE_OFF_T
|
|||
AC_STRUCT_ST_RDEV
|
||||
AC_HEADER_TIME
|
||||
AC_STRUCT_TM
|
||||
MYSQL_NEEDS_MYSYS_NEW
|
||||
# AC_CHECK_SIZEOF return 0 when it does not find the size of a
|
||||
# type. We want a error instead.
|
||||
AC_CHECK_SIZEOF(char, 1)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue