diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-14 18:37:53 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-14 18:37:53 +0200 |
| commit | 7581fb23e2d8126378296e987d84641d7bbd8914 (patch) | |
| tree | 5d459fa8238f54d7a83d94fa89d44c56a1aaa7cd | |
| parent | fc556a8d94130f30d9c0545f2146fb49166d310c (diff) | |
| download | mariadb-git-7581fb23e2d8126378296e987d84641d7bbd8914.tar.gz | |
compilation fix for SLES 11 SP4
also fix innodb
| -rw-r--r-- | storage/innobase/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index df60ba0d16f..dfa3b36f39e 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -75,9 +75,9 @@ CHECK_FUNCTION_EXISTS(sched_getcpu HAVE_SCHED_GETCPU) IF(NOT MSVC) # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not - # workaround for gcc 4.1.2 RHEL5/x86, gcc atomic ops only work under -march=i686 + # workaround for old gcc on x86, gcc atomic ops only work under -march=i686 IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "i686" AND CMAKE_COMPILER_IS_GNUCC AND - CMAKE_C_COMPILER_VERSION VERSION_LESS "4.1.3") + CMAKE_C_COMPILER_VERSION VERSION_LESS "4.4.0") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i686") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=i686") ENDIF() |