summaryrefslogtreecommitdiff
path: root/cmake/build_configurations
diff options
context:
space:
mode:
authorJonathan Perkin <jonathan.perkin@oracle.com>2010-07-02 14:02:50 +0100
committerJonathan Perkin <jonathan.perkin@oracle.com>2010-07-02 14:02:50 +0100
commitd8621f89248ac995739717b1ba09e54121f4d45b (patch)
treee165bbba96e92812ea573ee9e7e61cecaab4ce02 /cmake/build_configurations
parent38954b526bf77a4324ee3129bdcbe0fcfa01df3e (diff)
downloadmariadb-git-d8621f89248ac995739717b1ba09e54121f4d45b.tar.gz
Fix icc/icpc flags.
Diffstat (limited to 'cmake/build_configurations')
-rw-r--r--cmake/build_configurations/mysql_release.cmake8
1 files changed, 6 insertions, 2 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 88caf04d4c9..b6e5828bdc2 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -154,9 +154,13 @@ IF(UNIX)
IF(CMAKE_C_COMPILER_ID MATCHES "Intel")
SET(OPT_FLG "-O3 -unroll2 -ip")
SET(DBG_FLG "")
- SET(COMMON_CFLAGS "-static-intel -static-libgcc -g -mieee-fp -restrict -no-ftz -no-opt-prefetch")
- SET(COMMON_CXXFLAGS "-static-intel -static-libgcc -g -mieee-fp -restrict -no-ftz -no-opt-prefetch")
+ SET(COMMON_CFLAGS "-static-intel -static-libgcc -g -mp -restrict")
+ SET(COMMON_CXXFLAGS "${COMMON_CFLAGS} -fno-implicit-templates -fno-exceptions -fno-rtti")
SET(WITH_SSL no)
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
+ SET(COMMON_CFLAGS "${COMMON_CFLAGS} -no-ftz -no-prefetch")
+ SET(COMMON_CXXFLAGS "${COMMON_CXXFLAGS} -no-ftz -no-prefetch")
+ ENDIF()
ENDIF()
ENDIF()