From a5686e14d9884aae71d17bdee57fff90200d6ec3 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 27 Mar 2020 13:04:58 +1100 Subject: MDEV-21303 Use mariadbd as the library plugins link to on non-Linux Prevent errors like on FreeBSD [ 56%] Linking CXX shared module ha_test_sql_discovery.so cd /usr/home/dan/build-mariadb-server-10.5/storage/test_sql_discovery && /usr/local/bin/cmake -E cmake_link_script CMakeFiles/test_sql_discovery.dir/link.txt --verbose=1 /usr/bin/c++ -fPIC -Wl,-z,relro,-z,now -fstack-protector --param=ssp-buffer-size=4 -O2 -g -DNDEBUG -D_FORTIFY_SOURCE=2 -DDBUG_OFF -shared -o ha_test_sql_discovery.so CMakeFiles/test_sql_discovery.dir/test_sql_discovery.cc.o -lpthread ../../libservices/libmysqlservices.a -lmysqld -lpthread /usr/bin/ld: error: unable to find library -lmysqld Also tested on OpenIndiana successfully. Closes #1480 --- cmake/plugin.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/plugin.cmake') diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index b77f1ed58cc..8f3ed63c4e9 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -221,7 +221,7 @@ MACRO(MYSQL_ADD_PLUGIN) 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) + TARGET_LINK_LIBRARIES (${target} mariadbd) ENDIF() 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") -- cgit v1.2.1