diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-04-25 15:44:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-27 19:12:38 +0200 |
| commit | 7bf409593e624deb00265e21e0d4579ce9fa7999 (patch) | |
| tree | 7da6af1ff5a92126af5969a9504a82ddcf4cf263 /cmake | |
| parent | db3910741347e7d741f4a854075c248e9081d722 (diff) | |
| download | mariadb-git-7bf409593e624deb00265e21e0d4579ce9fa7999.tar.gz | |
MDEV-11660 Make encryption plugins "pure"
Do not exporting mysqld entry points directly.
This is needed for mariabackup, to load encryption plugins on Windows.
All plugins are "pure" by default. To mark plugin "impure"
it should use RECOMPILE_FOR_EMBEDDED or STORAGE_ENGINE keyword.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/plugin.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 8615d6ed4b2..3e7c5804f77 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -201,13 +201,15 @@ MACRO(MYSQL_ADD_PLUGIN) # executable to the linker command line (it would result into link error). # Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate # an additional dependency. - IF(NOT ARG_CLIENT) + IF(ARG_RECOMPILE_FOR_EMBEDDED OR ARG_STORAGE_ENGINE) IF(MSVC) ADD_DEPENDENCIES(${target} gen_mysqld_lib) TARGET_LINK_LIBRARIES(${target} mysqld_import_lib) ELSEIF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") TARGET_LINK_LIBRARIES (${target} mysqld) ENDIF() + ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") + TARGET_LINK_LIBRARIES (${target} "-Wl,--no-undefined") ENDIF() IF(ARG_LINK_LIBRARIES) |