diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 14:25:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 14:25:20 +0300 |
| commit | 780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e (patch) | |
| tree | b7447115f45de0f03bbe18c26fc0866367483066 /cmake/plugin.cmake | |
| parent | db9e41ddc31f2e705a54132cf69c781e1cc60f07 (diff) | |
| parent | 18af13b88ba580562981a190c25da128a2e9db26 (diff) | |
| download | mariadb-git-780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'cmake/plugin.cmake')
| -rw-r--r-- | cmake/plugin.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 89dfdbb306b..eec4fc6a33e 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -1,6 +1,6 @@ # Copyright (c) 2009, 2018, Oracle and/or its affiliates. -# Copyright (c) 2011, 2019, 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 # the Free Software Foundation; version 2 of the License. @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA INCLUDE(CMakeParseArguments) @@ -223,7 +223,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 AND NOT WITH_UBSAN) + ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT WITH_ASAN AND NOT WITH_TSAN AND NOT WITH_UBSAN AND NOT WITH_MSAN) TARGET_LINK_LIBRARIES (${target} "-Wl,--no-undefined") ENDIF() |