diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-27 23:10:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-27 23:10:55 +0200 |
| commit | c2a7dffc573f311029ed4696fb5bd88e5efba752 (patch) | |
| tree | 9f04258d84a42954afb0b8e36486fd6f303cf90d /storage/tokudb | |
| parent | 520c3f69a6caed5524d3214a0339736d673c4c0c (diff) | |
| parent | f20c63264ab4170fc8e45093042bd2e7272ce9fc (diff) | |
| download | mariadb-git-10.0.tar.gz | |
Merge tag 'mariadb-5.5.68' into 10.0bb-10.0-serg10.0
Diffstat (limited to 'storage/tokudb')
| -rw-r--r-- | storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake index d8796db8cbe..ea9f4ee1a1b 100644 --- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake +++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake @@ -205,9 +205,9 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang) set_cflags_if_supported(-Wcast-align) endif () -## always want these in debug builds -set(CMAKE_C_FLAGS_DEBUG "-Wall -Werror ${CMAKE_C_FLAGS_DEBUG}") -set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Werror ${CMAKE_CXX_FLAGS_DEBUG}") +## never want these +set(CMAKE_C_FLAGS "-Wno-error ${CMAKE_C_FLAGS}") +set(CMAKE_CXX_FLAGS "-Wno-error ${CMAKE_CXX_FLAGS}") # pick language dialect set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}") |