summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorEugene Kosov <claprix@yandex.ru>2019-01-29 14:45:51 +0300
committerSergey Vojtovich <svoj@mariadb.org>2019-03-11 13:37:19 +0400
commit2a2ab121b0f65cdc4b104ec763d23f1b7035a644 (patch)
treea0acf13574efb72a4a7dd9f7376a02dc856daff8 /cmake
parent04150218408741aa4599d90aefadb4cb6f15029c (diff)
downloadmariadb-git-2a2ab121b0f65cdc4b104ec763d23f1b7035a644.tar.gz
MDEV-17703 Add WITH_UBSAN switch to CMake similar to WITH_ASAN
This can be useful: UBSAN_OPTIONS=log_path=/some/path clang users may want to increase stack size in include/my_pthread.h or enable some optimizations
Diffstat (limited to 'cmake')
-rw-r--r--cmake/os/Linux.cmake2
-rw-r--r--cmake/plugin.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake
index b0680d92a1b..55be8674802 100644
--- a/cmake/os/Linux.cmake
+++ b/cmake/os/Linux.cmake
@@ -35,7 +35,7 @@ ENDFOREACH()
# Ensure we have clean build for shared libraries
# without unresolved symbols
# Not supported with AddressSanitizer
-IF(NOT WITH_ASAN)
+IF(NOT WITH_ASAN AND NOT WITH_UBSAN)
SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined")
ENDIF()
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index cfd9677333e..e38439f2a21 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -209,7 +209,7 @@ MACRO(MYSQL_ADD_PLUGIN)
ELSEIF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
TARGET_LINK_LIBRARIES (${target} mysqld)
ENDIF()
- ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT WITH_ASAN)
+ ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT WITH_ASAN AND NOT WITH_UBSAN)
TARGET_LINK_LIBRARIES (${target} "-Wl,--no-undefined")
ENDIF()