mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
Move test of gcc 3.0 from BUILD to configure
This commit is contained in:
parent
061038b7f0
commit
e2255e848f
2 changed files with 14 additions and 8 deletions
|
@ -67,11 +67,4 @@ else
|
|||
make=make
|
||||
fi
|
||||
|
||||
if gcc -v 2>&1 | grep 'version 3' > /dev/null 2>&1
|
||||
then
|
||||
CXX="gcc -DUSE_MYSYS_NEW"
|
||||
CXXLDFLAGS="-Wl,--defsym -Wl,__cxa_pure_virtual=0"
|
||||
else
|
||||
CXX=gcc
|
||||
CXXLDFLAGS=""
|
||||
fi
|
||||
CXX=gcc
|
||||
|
|
13
configure.in
13
configure.in
|
@ -321,6 +321,19 @@ then
|
|||
# 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"
|
||||
|
||||
# If you are using 'gcc' 3.0 (not g++) to compile C++ programs,
|
||||
# we will gets some problems when linking static programs.
|
||||
# The following code is used to fix this problem.
|
||||
|
||||
if test "$CXX" = "gcc"
|
||||
then
|
||||
if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1
|
||||
then
|
||||
CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW"
|
||||
CXXLDFLAGS="$CXXLDFLAGS -Wl,--defsym -Wl,__cxa_pure_virtual=0"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Avoid bug in fcntl on some versions of linux
|
||||
|
|
Loading…
Reference in a new issue