diff options
| author | unknown <baker@bk-internal.mysql.com> | 2006-09-16 07:19:42 +0200 |
|---|---|---|
| committer | unknown <baker@bk-internal.mysql.com> | 2006-09-16 07:19:42 +0200 |
| commit | 949e6681b4a94d6b9b66ceac250d8083bb28579e (patch) | |
| tree | 71a0711ebd5e76bbe03d69262db618c0fb8104a8 /BUILD | |
| parent | 55d66b090219af0c013c9dc1a0cdee4b2f91e493 (diff) | |
| parent | 89cdb94ab8db9bc3120833b1547350c2ed0cb83c (diff) | |
| download | mariadb-git-949e6681b4a94d6b9b66ceac250d8083bb28579e.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
sql/mysqld.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/compile-solaris-sparc | 14 | ||||
| -rwxr-xr-x | BUILD/compile-solaris-sparc-debug | 14 |
2 files changed, 10 insertions, 18 deletions
diff --git a/BUILD/compile-solaris-sparc b/BUILD/compile-solaris-sparc index 0c05bf8a101..db46fc4db27 100755 --- a/BUILD/compile-solaris-sparc +++ b/BUILD/compile-solaris-sparc @@ -1,11 +1,7 @@ -#! /bin/sh - -gmake -k clean || true -/bin/rm -f */.deps/*.P config.cache - +#!/usr/bin/bash path=`dirname $0` -. "$path/autorun.sh" - -CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client +. "$path/SETUP.sh" +extra_flags="" +extra_configs="$max_configs" -gmake -j 4 +. "$path/FINISH.sh" diff --git a/BUILD/compile-solaris-sparc-debug b/BUILD/compile-solaris-sparc-debug index 3384b623ccb..e92f7fecc84 100755 --- a/BUILD/compile-solaris-sparc-debug +++ b/BUILD/compile-solaris-sparc-debug @@ -1,11 +1,7 @@ -#! /bin/sh - -gmake -k clean || true -/bin/rm -f */.deps/*.P config.cache - +#!/usr/bin/bash path=`dirname $0` -. "$path/autorun.sh" - -CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-debug +. "$path/SETUP.sh" +extra_flags="$debug_cflags" +extra_configs="$debug_configs $max_configs" -gmake -j 4 +. "$path/FINISH.sh" |