Commit cd8a3709 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

WITH_MYSQLD_LIBS=>WITH_MYSQLD_LDFLAGS

parent ccf2600f
...@@ -146,15 +146,15 @@ DTRACE_INSTRUMENT_STATIC_LIBS(mysqld ...@@ -146,15 +146,15 @@ DTRACE_INSTRUMENT_STATIC_LIBS(mysqld
"sql;mysys;${MYSQLD_STATIC_PLUGIN_LIBS}") "sql;mysys;${MYSQLD_STATIC_PLUGIN_LIBS}")
SET(WITH_MYSQLD_LIBS "" CACHE STRING "Additional linker flags for mysqld") SET(WITH_MYSQLD_LDFLAGS "" CACHE STRING "Additional linker flags for mysqld")
MARK_AS_ADVANCED(WITH_MYSQLD_LIBS) MARK_AS_ADVANCED(WITH_MYSQLD_LDFLAGS)
IF(WITH_MYSQLD_LIBS) IF(WITH_MYSQLD_LDFLAGS)
GET_TARGET_PROPERTY(mysqld LINK_FLAGS MYSQLD_LINK_FLAGS) GET_TARGET_PROPERTY(mysqld LINK_FLAGS MYSQLD_LINK_FLAGS)
IF(NOT MYSQLD_LINK_FLAGS) IF(NOT MYSQLD_LINK_FLAGS)
SET(MYSQLD_LINK_FLAGS) SET(MYSQLD_LINK_FLAGS)
ENDIF() ENDIF()
SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS
"${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LIBS}") "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
ENDIF() ENDIF()
# Handle out-of-source build from source package with possibly broken # Handle out-of-source build from source package with possibly broken
......
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