bzr commit into mysql-trunk-bugfixing branch (jonathan.perkin:3129) Bug#55250

[Jonathan Perkin]

#At file:///Users/jonathan/bzr2/mysql-trunk-bugfixing/ based on revid:alik@ibmvm-20100719140029-4jjf0rgtkc6ru93s

 3129 Jonathan Perkin	2010-07-19
      bug#55250: 5.5.5-m3 incorrectly compiled with exceptions on Solaris/x86
      
      Put '-features=no%except' back into Solaris/x86 CXXFLAGS.

    modified:
      cmake/build_configurations/mysql_release.cmake
=== modified file 'cmake/build_configurations/mysql_release.cmake'
--- a/cmake/build_configurations/mysql_release.cmake	2010-07-06 10:28:11 +0000
+++ b/cmake/build_configurations/mysql_release.cmake	2010-07-19 14:23:02 +0000
@@ -194,7 +194,7 @@ IF(UNIX)  
     IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
       IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
         SET(COMMON_C_FLAGS                   "-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
-        SET(COMMON_CXX_FLAGS                 "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
+        SET(COMMON_CXX_FLAGS                 "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic")
         SET(CMAKE_C_FLAGS_DEBUG              "${COMMON_C_FLAGS}")
         SET(CMAKE_CXX_FLAGS_DEBUG            "${COMMON_CXX_FLAGS}")
         IF(32BIT)


Attachment: [text/bzr-bundle] bzr/[e-mail]