diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-11 17:49:36 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-11 17:49:36 +0200 |
| commit | 814205f306cad8a4b3e55785616ea69a027fef9d (patch) | |
| tree | f70402682975e8c6a99ea34a7b1ff3dd9ba73b32 /cmake | |
| parent | 89b463ee99c22e69fe4adf686e0d61cd20973c49 (diff) | |
| parent | 28e713dc12881e7f50207d0c642523ca3e630114 (diff) | |
| download | mariadb-git-814205f306cad8a4b3e55785616ea69a027fef9d.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/os/Linux.cmake | 4 | ||||
| -rw-r--r-- | cmake/plugin.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake index e3520f3accd..557b276113f 100644 --- a/cmake/os/Linux.cmake +++ b/cmake/os/Linux.cmake @@ -34,8 +34,8 @@ ENDFOREACH() # Ensure we have clean build for shared libraries # without unresolved symbols -# Not supported with AddressSanitizer and ThreadSanitizer -IF(NOT WITH_ASAN AND NOT WITH_TSAN) +# Not supported with the clang sanitizers +IF(NOT WITH_ASAN AND NOT WITH_TSAN AND NOT WITH_UBSAN) SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined") ENDIF() diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 5b3bac773e1..1252a796ba6 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -1,5 +1,5 @@ # Copyright (c) 2009, 2018, Oracle and/or its affiliates. -# Copyright (c) 2011, 2018, MariaDB Corporation +# Copyright (c) 2011, 2019, MariaDB Corporation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -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 AND NOT WITH_TSAN) + ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT WITH_ASAN AND NOT WITH_TSAN AND NOT WITH_UBSAN) TARGET_LINK_LIBRARIES (${target} "-Wl,--no-undefined") ENDIF() |