bk commit into 5.1 tree (mikron:1.2522)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-01 16:59:02+02:00, mikron@stripped +1 -0
  Bug fix for Mac OS X

  BUILD/build_source.sh@stripped, 2007-06-01 16:58:51+02:00, mikron@stripped +4 -3
    Bug fix for Mac OS X

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mikron
# Host:	mikael-ronstr-ms-dator.local
# Root:	/Users/mikron/mysql_clones/wl3834

--- 1.14/BUILD/build_source.sh	2007-06-01 15:33:29 +02:00
+++ 1.15/BUILD/build_source.sh	2007-06-01 16:58:51 +02:00
@@ -242,7 +242,7 @@
   MacOSX/x86/gcc
   --------------
   C/C++ flags will include -fno-common -arch i386
-  For non-debug versions we'll also add -Os --felide-constructors where -Os means
+  For non-debug versions we'll also add -Os -felide-constructors where -Os means
   space-optimised as long as the space optimisations doesn't negatively affect
   performance. Debug versions will use -O
 EOF
@@ -1191,7 +1191,7 @@
 # Mac OS X Section
 #
 if test "x$os" = "xMacOSX" ; then
-  base_cxxflags="$base_cxxflags --fno-common"
+  base_cxxflags="$base_cxxflags -fno-common"
   if test "x$cpu_base_type" = "xx86" && test "x$compiler" = "xgcc" ; then
     compiler_flags="$compiler_flags -arch i386"
   else
@@ -1203,7 +1203,8 @@
 # optimisations also when not in fast mode.
 #
   if test "x$fast_flag" != "xno" ; then
-    compiler_flags="$compiler_flags -Os --felide-constructors"
+    compiler_flags="$compiler_flags -Os"
+    base_cxxflags="$base_cxxflags -felide-constructors"
   else
     compiler_flags="$compiler_flags -O"
   fi