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).

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

storage/innobase/CMakeLists.txt

@@ -163,7 +163,6 @@ IF(NOT TARGET innobase)
   RETURN()
 ENDIF()
 
-INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 # A GCC bug causes crash when compiling these files on ARM64 with -O1+
 # Compile them with -O0 as a workaround.
 IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")

storage/innobase/innodb.cmake

@@ -255,9 +255,8 @@ ENDIF()
 
 # Avoid generating Hardware Capabilities due to crc32 instructions
 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
-  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-  MY_CHECK_CXX_COMPILER_FLAG("-Wa,-nH" HAVE_WA_NH)
-  IF(HAVE_WA_NH)
+  MY_CHECK_CXX_COMPILER_FLAG("-Wa,-nH")
+  IF(have_CXX__Wa__nH)
     ADD_COMPILE_FLAGS(
       ut/ut0crc32.cc
       COMPILE_FLAGS "-Wa,-nH"