diff options
| -rw-r--r-- | BUILD/SETUP.sh | 9 | ||||
| -rw-r--r-- | configure.in | 13 |
2 files changed, 14 insertions, 8 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index a69cdcb14fd..9204d4216d1 100644 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -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 diff --git a/configure.in b/configure.in index 959073eda02..b55f1f6f726 100644 --- a/configure.in +++ b/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 |