diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2018-04-05 17:36:59 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2018-04-05 17:45:36 +0400 |
| commit | 5ccf3f96ac96662c39527997a359746088cef2fb (patch) | |
| tree | fb945391261ffb2ee2619e2ef73f937790df36f4 /extra/CMakeLists.txt | |
| parent | 4fde1361a6f9880fda2ee30f99e66ef0a59c32c4 (diff) | |
| download | mariadb-git-5ccf3f96ac96662c39527997a359746088cef2fb.tar.gz | |
Fix misuse of MY_CHECK_CXX_COMPILER_FLAG
- compile_flags already include from top CMakeLists.txt
- MY_CHECK_CXX_COMPILER_FLAG() accepts only one parameter
- output variable of MY_CHECK_CXX_COMPILER_FLAG() is have_CXX__Wa__nH
- same check for mariabackup
Based on contribution by satanson (PR#466).
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 8c73e23d72b..136a802d1ba 100644 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -73,6 +73,17 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_XTRADB_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 |