diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-12 12:41:19 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-12 12:41:19 +0300 |
commit | 65eefcdc601ef0f57b0779f1722161fc83a571c3 (patch) | |
tree | 7fe642e7d6e685ed87fbd292d986b871b5e0a720 /extra/CMakeLists.txt | |
parent | 9c42b9038dc1457fd4aeed0520bc143a043a84d9 (diff) | |
parent | 36c01167200cf29ac92f3bd3263d7757c55cbb89 (diff) | |
download | mariadb-git-65eefcdc601ef0f57b0779f1722161fc83a571c3.tar.gz |
Merge remote-tracking branch '10.2' into 10.3
Diffstat (limited to 'extra/CMakeLists.txt')
-rw-r--r-- | extra/CMakeLists.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index d3626733bd3..cd099dedf63 100644 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -73,6 +73,17 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) # We use the InnoDB code directly in case the code changes. ADD_DEFINITIONS("-DUNIV_INNOCHECKSUM") + # Avoid generating Hardware Capabilities due to crc32 instructions + IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386") + MY_CHECK_CXX_COMPILER_FLAG("-Wa,-nH") + IF(have_CXX__Wa__nH) + ADD_COMPILE_FLAGS( + ../storage/innobase/ut/ut0crc32.cc + COMPILE_FLAGS "-Wa,-nH" + ) + ENDIF() + ENDIF() + SET(INNOBASE_SOURCES ../storage/innobase/buf/buf0checksum.cc ../storage/innobase/ut/ut0crc32.cc |