diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 968cab85e52..9656245b8c0 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -153,8 +153,8 @@ SET (SQL_SOURCE
                ${MYSYS_LIBWRAP_SOURCE}
 )
 
-IF(CMAKE_C_COMPILER_ID MATCHES "Clang" AND
-   NOT CMAKE_C_COMPILER_VERSION VERSION_LESS "13.0.0")
+MY_CHECK_CXX_COMPILER_FLAG(-Wno-unused-but-set-variable)
+IF(have_CXX__Wno_unused_but_set_variable)
   ADD_COMPILE_FLAGS(${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc
     ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.cc
     COMPILE_FLAGS "-Wno-unused-but-set-variable")
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index ae19773d98b..514c14557c2 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -358,8 +358,9 @@ IF(MSVC)
   # on generated file.
   TARGET_COMPILE_OPTIONS(innobase PRIVATE "/wd4065")
 ENDIF()
-IF(CMAKE_C_COMPILER_ID MATCHES "Clang" AND
-   NOT CMAKE_C_COMPILER_VERSION VERSION_LESS "13.0.0")
+
+MY_CHECK_CXX_COMPILER_FLAG(-Wno-unused-but-set-variable)
+IF(have_CXX__Wno_unused_but_set_variable)
   ADD_COMPILE_FLAGS(pars/pars0grm.cc fts/fts0pars.cc
     COMPILE_FLAGS "-Wno-unused-but-set-variable")
 ENDIF()