diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-12-16 13:08:17 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-12-16 13:08:17 +0400 |
| commit | 3d98892232359b7262cf82d00bc8f94b1511f26b (patch) | |
| tree | b48c157fde886efc051ada08296eb6cb4f4eedc2 /storage/tokudb | |
| parent | a3a8360d577b44131577c5d40336c632d35487ae (diff) | |
| parent | fc860d3fa3bc854fbe6aab9179d7a4aaf6eb9edf (diff) | |
| download | mariadb-git-3d98892232359b7262cf82d00bc8f94b1511f26b.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.1
Diffstat (limited to 'storage/tokudb')
| -rw-r--r-- | storage/tokudb/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 618d257be29..7313a4dcce4 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -49,6 +49,12 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-vla" DEBUG) MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-implicit-fallthrough") MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-cpp" DEBUG) +CHECK_C_COMPILER_FLAG("-Wno-address-of-packed-member" HAVE_NO_ADDRESS_PACKED) +IF(HAVE_NO_ADDRESS_PACKED) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-address-of-packed-member") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-address-of-packed-member") +ENDIF() + ############################################ SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump" PARENT_SCOPE) MARK_AS_ADVANCED(BUILDNAME) |