diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-04-30 17:36:41 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-04-30 17:36:41 +0200 |
| commit | 23c6fb3e6231b8939331e2d9f157092f24ed8f4f (patch) | |
| tree | ff0f65edbc442afcc3f3a3159753c8a2284d9c95 /storage/tokudb | |
| parent | de8c9b538f7e77f18470ccfcacf723a9c2e31b38 (diff) | |
| parent | 6a31aea5a1a50614af3a6591a085dc47061cdd0e (diff) | |
| download | mariadb-git-23c6fb3e6231b8939331e2d9f157092f24ed8f4f.tar.gz | |
Merge branch '5.5' into 10.1
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 8f65895cc9c..8b3a0e61418 100644 --- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake +++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake @@ -170,9 +170,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}") |