diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-07-19 15:23:02 +0100 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-07-19 15:23:02 +0100 |
| commit | 40856e830ded489100bc7832bf4e2b5d11175f26 (patch) | |
| tree | 5a6f880a52ef108d0043c13799fd11626f8b97f1 /cmake/build_configurations | |
| parent | 9503a8e23f25aa13d68d41444473996f28a7de3d (diff) | |
| download | mariadb-git-40856e830ded489100bc7832bf4e2b5d11175f26.tar.gz | |
bug#55250: 5.5.5-m3 incorrectly compiled with exceptions on Solaris/x86
Put '-features=no%except' back into Solaris/x86 CXXFLAGS.
Diffstat (limited to 'cmake/build_configurations')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 6e0f82e73a7..9d010ef7f2a 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -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) |