Commit 3f1a2562 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-31890: Remove COMPILE_FLAGS

The cmake configuration step is single-threaded and already consuming
too much time. We should not make it worse by adding invocations like
MY_CHECK_CXX_COMPILER_FLAG().

Let us prefer something that works on any supported version
of GCC (4.8.5 or later) or clang, as well as recent versions
of the Intel C compiler.

This replaces commit 1fde7853
parent 702dc2ec
...@@ -359,12 +359,6 @@ IF(MSVC) ...@@ -359,12 +359,6 @@ IF(MSVC)
TARGET_COMPILE_OPTIONS(innobase PRIVATE "/wd4065") TARGET_COMPILE_OPTIONS(innobase PRIVATE "/wd4065")
ENDIF() ENDIF()
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()
IF(NOT (PLUGIN_INNOBASE STREQUAL DYNAMIC)) IF(NOT (PLUGIN_INNOBASE STREQUAL DYNAMIC))
ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/extra/mariabackup ${CMAKE_BINARY_DIR}/extra/mariabackup) ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/extra/mariabackup ${CMAKE_BINARY_DIR}/extra/mariabackup)
ENDIF() ENDIF()
......
...@@ -83,15 +83,15 @@ ...@@ -83,15 +83,15 @@
#include "fts0tlex.h" #include "fts0tlex.h"
#include "fts0pars.h" #include "fts0pars.h"
#include <my_sys.h> #include <my_sys.h>
extern int fts_lexer(YYSTYPE*, fts_lexer_t*); extern int fts_lexer(YYSTYPE*, fts_lexer_t*);
extern int fts_blexer(YYSTYPE*, yyscan_t); extern int fts_blexer(YYSTYPE*, yyscan_t);
extern int fts_tlexer(YYSTYPE*, yyscan_t); extern int fts_tlexer(YYSTYPE*, yyscan_t);
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wpragmas"
# pragma GCC diagnostic ignored "-Wunknown-warning-option"
# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
extern int ftserror(const char* p); extern int ftserror(const char* p);
/* Required for reentrant parser */ /* Required for reentrant parser */
#define ftslex fts_lexer #define ftslex fts_lexer
......
...@@ -31,15 +31,15 @@ this program; if not, write to the Free Software Foundation, Inc., ...@@ -31,15 +31,15 @@ this program; if not, write to the Free Software Foundation, Inc.,
#include "fts0tlex.h" #include "fts0tlex.h"
#include "fts0pars.h" #include "fts0pars.h"
#include <my_sys.h> #include <my_sys.h>
extern int fts_lexer(YYSTYPE*, fts_lexer_t*); extern int fts_lexer(YYSTYPE*, fts_lexer_t*);
extern int fts_blexer(YYSTYPE*, yyscan_t); extern int fts_blexer(YYSTYPE*, yyscan_t);
extern int fts_tlexer(YYSTYPE*, yyscan_t); extern int fts_tlexer(YYSTYPE*, yyscan_t);
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wpragmas"
# pragma GCC diagnostic ignored "-Wunknown-warning-option"
# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
extern int ftserror(const char* p); extern int ftserror(const char* p);
/* Required for reentrant parser */ /* Required for reentrant parser */
#define ftslex fts_lexer #define ftslex fts_lexer
......
...@@ -78,13 +78,13 @@ que_node_t */ ...@@ -78,13 +78,13 @@ que_node_t */
#include "que0types.h" #include "que0types.h"
#include "que0que.h" #include "que0que.h"
#include "row0sel.h" #include "row0sel.h"
#ifdef __GNUC__
#if defined __GNUC__ && (!defined __clang_major__ || __clang_major__ > 11) # pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic ignored "-Wfree-nonheap-object" # pragma GCC diagnostic ignored "-Wunknown-warning-option"
# pragma GCC diagnostic ignored "-Wfree-nonheap-object"
# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif #endif
#define YYSTYPE que_node_t* #define YYSTYPE que_node_t*
/* #define __STDC__ */ /* #define __STDC__ */
int int
yylex(void); yylex(void);
......
...@@ -37,13 +37,13 @@ que_node_t */ ...@@ -37,13 +37,13 @@ que_node_t */
#include "que0types.h" #include "que0types.h"
#include "que0que.h" #include "que0que.h"
#include "row0sel.h" #include "row0sel.h"
#ifdef __GNUC__
#if defined __GNUC__ && (!defined __clang_major__ || __clang_major__ > 11) # pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic ignored "-Wfree-nonheap-object" # pragma GCC diagnostic ignored "-Wunknown-warning-option"
# pragma GCC diagnostic ignored "-Wfree-nonheap-object"
# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif #endif
#define YYSTYPE que_node_t* #define YYSTYPE que_node_t*
/* #define __STDC__ */ /* #define __STDC__ */
int int
yylex(void); yylex(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment