summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2006-09-13 22:09:05 -0700
committerunknown <brian@zim.(none)>2006-09-13 22:09:05 -0700
commite7a27b6a5812c87fc4e3064f3bdc4f92ff67a5e2 (patch)
treee5533fd442138f3e50d99a4b6a08b88ee283e39c /BUILD
parent6a490444a615b9fd8ee057f71c215175cd6eb4cc (diff)
parent1f696801d4d08791903c466473d1f8f065a10039 (diff)
downloadmariadb-git-e7a27b6a5812c87fc4e3064f3bdc4f92ff67a5e2.tar.gz
Merge brian@dib.tangent.org:/export/home/brian/mysql/gnu-5.1
into zim.(none):/home/brian/mysql/merge-5.1 BUILD/check-cpu: merge
Diffstat (limited to 'BUILD')
-rwxr-xr-xBUILD/compile-solaris-sparc14
-rwxr-xr-xBUILD/compile-solaris-sparc-debug14
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"