bzr push into mysql-5.0 branch (df:2637 to 2638) Bug#37623

[Daniel Fischer]

 2638 Daniel Fischer	2008-07-05
      ild can not be expected on all matching installs
modified:
  configure.in

 2637 Joerg Bruehe	2008-06-27 [merge]
      Take the fix for bug#37623 (Suffix "-64bit" is duplicated)
      into the 5.0-build team tree.
modified:
  scripts/make_binary_distribution.sh

=== modified file 'configure.in'
--- a/configure.in	2008-06-10 12:25:21 +0000
+++ b/configure.in	2008-07-05 07:44:10 +0000
@@ -2812,9 +2812,15 @@ EOF
 
 case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in
   *solaris*-i?86-no-yes)
-  # ndb fail for whatever strange reason to link Sun Forte/x86
-  # unless using incremental linker
-  CXXFLAGS="$CXXFLAGS -xildon"
+  if $CC -xildon 2>&1 | grep "illegal option" >/dev/null
+  then
+    # This Solaris ld does not support -xildon
+    true
+  else
+    # ndb fail for whatever strange reason to link Sun Forte/x86
+    # unless using incremental linker
+    CXXFLAGS="$CXXFLAGS -xildon"
+  fi
   ;;
   *) ;;
 esac