Commit 8893d199 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-17009 PIE issue on FreeBSD after 10.3.9 update

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

Also fixes
MDEV-17010 Multiple definition issue on FreeBSD after 10.3.9 update
parent 27235eed
...@@ -279,7 +279,7 @@ IF(APPLE) ...@@ -279,7 +279,7 @@ IF(APPLE)
# Add CoreServices framework since some dloadable plugins may need it # Add CoreServices framework since some dloadable plugins may need it
FIND_LIBRARY(CORESERVICES NAMES CoreServices) FIND_LIBRARY(CORESERVICES NAMES CoreServices)
IF(CORESERVICES) IF(CORESERVICES)
TARGET_LINK_LIBRARIES(mysqld ${CORESERVICES}) TARGET_LINK_LIBRARIES(mysqld LINK_PRIVATE ${CORESERVICES})
ENDIF() ENDIF()
ENDIF() ENDIF()
...@@ -300,7 +300,7 @@ IF(NOT WITHOUT_DYNAMIC_PLUGINS) ...@@ -300,7 +300,7 @@ IF(NOT WITHOUT_DYNAMIC_PLUGINS)
ENDIF() ENDIF()
ENDIF(NOT WITHOUT_DYNAMIC_PLUGINS) ENDIF(NOT WITHOUT_DYNAMIC_PLUGINS)
TARGET_LINK_LIBRARIES(mysqld sql) TARGET_LINK_LIBRARIES(mysqld LINK_PRIVATE sql)
# Provide plugins with minimal set of libraries # Provide plugins with minimal set of libraries
SET(INTERFACE_LIBS ${LIBRT}) SET(INTERFACE_LIBS ${LIBRT})
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment