Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


BUILD/compile-solaris-sparc-purify:
  Auto merged

1 files changed, 4 insertions, 4 deletions

diff --git a/BUILD/compile-solaris-sparc-purify b/BUILD/compile-solaris-sparc-purify
index dd9ed2f7292..41ecd4ed530 100755
--- a/BUILD/compile-solaris-sparc-purify
+++ b/BUILD/compile-solaris-sparc-purify
@@ -60,7 +60,7 @@ purifying_binaries ()
     if [ -n "$cxxfilt" ] ; then
       opts="$opts -demangle-program=$cxxfilt"
     fi
-    opts="$opts -best-effort g++"
+    opts="$opts -best-effort"
 
     back=`pwd`
     cd $dir
@@ -75,17 +75,17 @@ purifying_binaries ()
     fi
 
     if [ -n "$mode" -a $mode = purify ] ; then
-      gmake CXXLD="purify   $opts"  $target
+      gmake CCLD="purify   $opts gcc"  CXXLD="purify   $opts g++"  $target
       mv $binary $binary-purify
     fi
 
     if [ -n "$mode" -a $mode = quantify ] ; then
-      gmake CXXLD="quantify $opts"  $target
+      gmake CCLD="quantify $opts gcc"  CXXLD="quantify $opts g++"  $target
       mv $binary $binary-quantify
     fi
 
     if [ -n "$mode" -a $mode = purecov ] ; then
-      gmake CXXLD="purecov  $opts"  $target
+      gmake CCLD="purecov  $opts gcc"  CXXLD="purecov  $opts g++"  $target
       mv $binary $binary-purecov
     fi