diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 10:37:31 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 10:37:31 +0100 |
commit | de2d08994255739d53ba28ea34288ca8352029b1 (patch) | |
tree | cc557fe9fa3655a03cae9b6895c6e8a0348b2f86 /sql/CMakeLists.txt | |
parent | 4d9fe4032b768e04e33482d83199882c7bb0d9d8 (diff) | |
parent | 638625278e7cadf42633e6f9d1b663ca1e3e1bb1 (diff) | |
download | mariadb-git-de2d08994255739d53ba28ea34288ca8352029b1.tar.gz |
Merge branch '10.8' into 10.9
Diffstat (limited to 'sql/CMakeLists.txt')
-rw-r--r-- | sql/CMakeLists.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 8ba3f2086f2..8ed62f0ae45 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -234,6 +234,15 @@ FOREACH(se aria partition perfschema sql_sequence wsrep) ENDIF() ENDFOREACH() +IF(VISIBILITY_HIDDEN_FLAG AND TARGET partition AND WITH_UBSAN) + # the spider plugin needs some partition symbols from inside mysqld + # when built with ubsan, in which case we need to remove + # -fvisibility=hidden from partition + GET_TARGET_PROPERTY(f partition COMPILE_FLAGS) + STRING(REPLACE "${VISIBILITY_HIDDEN_FLAG}" "" f ${f}) + SET_TARGET_PROPERTIES(partition PROPERTIES COMPILE_FLAGS "${f}") +ENDIF() + IF(WIN32) SET(MYSQLD_SOURCE main.cc message.rc) ELSE() |