mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-04-02 05:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions1

MDEV-17009 PIE issue on FreeBSD after 10.3.9 update

Browse source 
Followup for 96b8909062. Only link mysqld with
${INTERFACE_LIBS} using LINK_PUBLIC, everything else should be
using LINK_PRIVATE. This restores pre-96b8909062c behavior.

Also fixes
MDEV-17010 Multiple definition issue on FreeBSD after 10.3.9 update
This commit is contained in:
Sergei Golubchik 2018-09-15 10:26:23 +02:00
parent 27235eed67
commit 8893d199ef
1 changed files with 2 additions and 2 deletions

4
sql/CMakeLists.txt
View file

@ -279,7 +279,7 @@ IF(APPLE)
# Add CoreServices framework since some dloadable plugins may need it
FIND_LIBRARY(CORESERVICES NAMES CoreServices)
IF(CORESERVICES)
TARGET_LINK_LIBRARIES(mysqld ${CORESERVICES})
TARGET_LINK_LIBRARIES(mysqld LINK_PRIVATE ${CORESERVICES})
ENDIF()
ENDIF()
@ -300,7 +300,7 @@ IF(NOT WITHOUT_DYNAMIC_PLUGINS)
ENDIF()
ENDIF(NOT WITHOUT_DYNAMIC_PLUGINS)
TARGET_LINK_LIBRARIES(mysqld sql)
TARGET_LINK_LIBRARIES(mysqld LINK_PRIVATE sql)
# Provide plugins with minimal set of libraries
SET(INTERFACE_LIBS ${LIBRT})