This fixes support for building mysql on Solaris with GNU tools.

BUILD/check-cpu:
  Simple Solaris support
BUILD/compile-solaris-sparc:
  Cleanup of Solars support
BUILD/compile-solaris-sparc-debug:
  Cleanup of solaris support

3 files changed, 14 insertions, 18 deletions

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index 2543b540d2a..43803b9cb04 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -113,6 +113,10 @@ case "$cpu_family--$model_name" in
     cpu_arg='powerpc'
     ;;
 
+  *SunOS*)
+    cpu_arg=''
+    ;;
+
   # unknown
   *)
     cpu_arg="";
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"