diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-11 11:45:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-11 11:45:33 +0200 |
| commit | 3ea49d35bd93c515f3da55b846850ba1125971a0 (patch) | |
| tree | 6ac151cd540109709f3f89e6fdd0ecb324781dd8 /cmake | |
| parent | ab7e2b048d7d0835ae7473873169b7606114348e (diff) | |
| parent | 2a2ab121b0f65cdc4b104ec763d23f1b7035a644 (diff) | |
| download | mariadb-git-3ea49d35bd93c515f3da55b846850ba1125971a0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/os/Linux.cmake | 2 | ||||
| -rw-r--r-- | cmake/plugin.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake index 6c846570ea7..f0e783afae8 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 bb8f2e3fb7f..65e85983d68 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() |