diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-24 10:21:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-24 10:21:26 +0300 |
| commit | 6ce0a6f9ad77e7934e27db1b73d6d98064352928 (patch) | |
| tree | 351d7da0892c9a78310ffc39754c3ec4b38a188e /storage/rocksdb | |
| parent | b5c050563b1bfa1155b3b6a3b7c0c59775e77f13 (diff) | |
| parent | 882ce206dbf06b771ffe4cbce2e3e4214982f302 (diff) | |
| download | mariadb-git-6ce0a6f9ad77e7934e27db1b73d6d98064352928.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/rocksdb')
| -rw-r--r-- | storage/rocksdb/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index 19f0d3cfa99..c2fc8de8149 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -54,6 +54,9 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU") SKIP_ROCKSDB_PLUGIN("${OLD_COMPILER_MSG}") ENDIF() SET(CXX11_FLAGS "-std=c++11") + IF (GCC_VERSION VERSION_LESS 5.0) + SET(CXX11_FLAGS "-std=c++11 -Wno-missing-field-initializers") + ENDIF() ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang") IF ((CMAKE_CXX_COMPILER_VERSION AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.3) OR (CLANG_VERSION_STRING AND CLANG_VERSION_STRING VERSION_LESS 3.3)) |