diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-06-01 16:38:01 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-06-01 16:38:01 +0400 |
| commit | 522d9ac30f3481564ee933aa3f1212fb2992385b (patch) | |
| tree | 27a04705528c5c8baecb74ee4ea6c6c03fdc56e8 /BUILD | |
| parent | ce461570ef3c501681bfb68d020a4252f6b51e77 (diff) | |
| parent | 6962ef4db9f68ba6925f40924d7731bc5a2eca92 (diff) | |
| download | mariadb-git-522d9ac30f3481564ee933aa3f1212fb2992385b.tar.gz | |
Auto-merge from mysql-trunk-bugfixing.
Due to a BZR bug, that merge was done by the following command:
bzr merge -r 'revid:tor.didriksen@sun.com-20100527074248-6qtv0p1ugy6o1hjo..' <mysql-trunk-bugfixing path>
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/Makefile.am | 2 | ||||
| -rwxr-xr-x | BUILD/compile-alpha-ccc | 41 | ||||
| -rwxr-xr-x | BUILD/compile-alpha-cxx | 43 |
3 files changed, 0 insertions, 86 deletions
diff --git a/BUILD/Makefile.am b/BUILD/Makefile.am index 496fb302b16..c7bf813c9fe 100644 --- a/BUILD/Makefile.am +++ b/BUILD/Makefile.am @@ -25,8 +25,6 @@ EXTRA_DIST = FINISH.sh \ check-cpu \ cleanup \ compile-alpha \ - compile-alpha-ccc \ - compile-alpha-cxx \ compile-alpha-debug \ compile-amd64-debug-max \ compile-amd64-debug-max-no-ndb \ diff --git a/BUILD/compile-alpha-ccc b/BUILD/compile-alpha-ccc deleted file mode 100755 index 59ed241d51c..00000000000 --- a/BUILD/compile-alpha-ccc +++ /dev/null @@ -1,41 +0,0 @@ -#! /bin/sh - -/bin/rm -f */.deps/*.P */*.o -make -k maintainer-clean -/bin/rm -f */.deps/*.P */*.o -/bin/rm -f config.cache mysql-*.tar.gz - -path=`dirname $0` -. "$path/autorun.sh" - -CC=ccc CFLAGS="-fast -O3 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -mcpu=ev6 -Wa,-mev6" CXXLDFLAGS='/usr/lib/compaq/libots-2.2.7/libots.so /usr/lib/compaq/cpml-5.0.0/libcpml_ev6.a' ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client -make -rm */.deps/* -make -if [ $? = 0 ] -then - rm */.deps/* - bin/mysqladmin shutdown - sur make install - if [ $? = 0 ] - then - scripts/make_binary_distribution - fi -fi - -exit - -# This should give better performance by compiling many files at once, but -# according to our benchmarks there isn't any real difference. - -pwd=`pwd` -for i in */make-ccc -do - cd `dirname $i` - make-ccc - cd $pwd -done -cd sql -rm mysqld .deps/*.P -make mysqld -cd $pwd diff --git a/BUILD/compile-alpha-cxx b/BUILD/compile-alpha-cxx deleted file mode 100755 index a1b5605ac5e..00000000000 --- a/BUILD/compile-alpha-cxx +++ /dev/null @@ -1,43 +0,0 @@ -#! /bin/sh - -/bin/rm -f */.deps/*.P */*.o -make -k maintainer-clean -/bin/rm -f */.deps/*.P */*.o -/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache mysql-*.tar.gz - -path=`dirname $0` -. "$path/autorun.sh" - -CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared --without-extra-tools --disable-dependency-tracking - -make -j2 -find . -name ".deps" | xargs rm -r -make -if [ $? = 0 ] -then - find . -name ".deps" | xargs rm -r - bin/mysqladmin shutdown - sur make install - if [ $? = 0 ] - then - scripts/make_binary_distribution - fi - make test -fi - -exit - -# This should give better performance by compiling many files at once, but -# according to our benchmarks there isn't any real difference. - -pwd=`pwd` -for i in */make-ccc -do - cd `dirname $i` - make-ccc - cd $pwd -done -cd sql -rm mysqld .deps/*.P -make mysqld -cd $pwd |