diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2020-03-27 13:04:58 +1100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-04-02 14:03:54 +0200 |
| commit | a5686e14d9884aae71d17bdee57fff90200d6ec3 (patch) | |
| tree | 3a7d11681b3a768a97328a91f77ae390a7eb6e1a /cmake/plugin.cmake | |
| parent | 5f3501a6e59a6a2e7e3d8b6d8bd0f3cee2474c6d (diff) | |
| download | mariadb-git-a5686e14d9884aae71d17bdee57fff90200d6ec3.tar.gz | |
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
Diffstat (limited to 'cmake/plugin.cmake')
| -rw-r--r-- | cmake/plugin.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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") |