diff options
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/FINISH.sh | 3 | ||||
| -rw-r--r-- | BUILD/Makefile.am | 45 | ||||
| -rw-r--r-- | BUILD/SETUP.sh | 4 |
3 files changed, 50 insertions, 2 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 2e2ba1f7358..fbeaf1e3c68 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -20,7 +20,8 @@ then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) fi -CFLAGS=\"$cflags\" CXX=$CXX CXXFLAGS=\"$cxxflags\" $configure" +CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \ +$configure" if [ -z "$just_configure" ] then diff --git a/BUILD/Makefile.am b/BUILD/Makefile.am new file mode 100644 index 00000000000..ca42a79eec0 --- /dev/null +++ b/BUILD/Makefile.am @@ -0,0 +1,45 @@ +# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + +## Process this file with automake to create Makefile.in + +EXTRA_DIST = FINISH.sh \ + SETUP.sh \ + compile-alpha \ + compile-alpha-ccc \ + compile-alpha-cxx \ + compile-alpha-debug \ + compile-ia64-debug-max \ + compile-pentium \ + compile-pentium-debug \ + compile-pentium-debug-max \ + compile-pentium-debug-no-bdb \ + compile-pentium-debug-openssl \ + compile-pentium-gcov \ + compile-pentium-gprof \ + compile-pentium-max \ + compile-pentium-myodbc \ + compile-pentium-mysqlfs-debug \ + compile-pentium-pgcc \ + compile-pentium-symbols \ + compile-solaris-sparc \ + compile-solaris-sparc-debug \ + compile-solaris-sparc-fortre \ + compile-solaris-sparc-purify + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index f878123db59..3fa297fea1a 100644 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -69,7 +69,9 @@ fi if gcc -v 2>&1 | grep 'version 3' > /dev/null 2>&1 then - CXX=c++ + CXX="gcc -DUSE_MYSYS_NEW" + CXXLDFLAGS="-Wl,--defsym -Wl,__cxa_pure_virtual=0" else CXX=gcc + CXXLDFLAGS="" fi |