6 files changed, 12 insertions, 10 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index c7cd43fa64e..fbeaf1e3c68 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -10,7 +10,7 @@ done
 
 commands="\
 $make -k clean || true 
-/bin/rm -f */.deps/*.P config.cache
+/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache
 
 aclocal && autoheader && aclocal && automake && autoconf
 (cd bdb/dist && sh s_all)
@@ -20,7 +20,8 @@ then
    (cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
 fi
 
-CFLAGS=\"$cflags\" CXX=$CXX CXXFLAGS=\"$cxxflags\" $configure"
+CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \
+$configure"
 
 if [ -z "$just_configure" ]
 then
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 0f2334dd573..a69cdcb14fd 100644
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -52,7 +52,8 @@ debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O1"
 
 base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
 
-base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static"
+base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client"
+static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"
 alpha_configs=""	# Not used yet
 pentium_configs=""
 sparc_configs=""
@@ -68,7 +69,9 @@ fi
 
 if gcc -v 2>&1 | grep 'version 3' > /dev/null 2>&1
 then
-  CXX=c++
+  CXX="gcc -DUSE_MYSYS_NEW"
+  CXXLDFLAGS="-Wl,--defsym -Wl,__cxa_pure_virtual=0"
 else
   CXX=gcc
+  CXXLDFLAGS=""
 fi
diff --git a/BUILD/compile-alpha b/BUILD/compile-alpha
index 10b9d67e1c1..ce5050fee72 100755
--- a/BUILD/compile-alpha
+++ b/BUILD/compile-alpha
@@ -4,6 +4,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$alpha_cflags $fast_cflags"
-extra_configs="$alpha_configs"
+extra_configs="$alpha_configs $static_link"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium b/BUILD/compile-pentium
index 11559be93de..b8f8d028e1f 100755
--- a/BUILD/compile-pentium
+++ b/BUILD/compile-pentium
@@ -4,9 +4,7 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $fast_cflags"
-extra_configs="$pentium_configs"
+extra_configs="$pentium_configs $static_link"
 strip=yes
 
-extra_configs="$extra_configs"
-
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov
index 6b5c432e999..873d1d0d8e8 100755
--- a/BUILD/compile-pentium-gcov
+++ b/BUILD/compile-pentium-gcov
@@ -4,6 +4,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags -O2 -fprofile-arcs -ftest-coverage"
-extra_configs="$pentium_configs $debug_configs --disable-shared"
+extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-gprof b/BUILD/compile-pentium-gprof
index 02b595d1015..aa74de0b1b2 100755
--- a/BUILD/compile-pentium-gprof
+++ b/BUILD/compile-pentium-gprof
@@ -4,6 +4,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags -O2 -pg -g"
-extra_configs="$pentium_configs $debug_configs --disable-shared"
+extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
 
 . "$path/FINISH.sh"