Skip to content
Permalink
Browse files

MDEV-12938 Discrepancy between mysql_config and mariadb_config

Use the correct target name when querying libmariadb.so dependencies.
Filter out linker options (no-undefined and the version script)
  • Loading branch information...
vuvova committed Jun 30, 2017
1 parent d2d5230 commit 186075adf285725be1c8ca6f668addccf76b4f95
Showing with 2 additions and 2 deletions.
  1. +2 −2 cmake/for_clients.cmake
@@ -45,7 +45,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
ENDIF()
ENDMACRO()

EXTRACT_LINK_LIBRARIES(mariadb LIBS)
EXTRACT_LINK_LIBRARIES(libmariadb LIBS)
EXTRACT_LINK_LIBRARIES(mysqlserver EMB_LIBS)

SET(LIBS "-lmariadb ${ZLIB_DEPS} ${LIBS} ${openssl_libs}")
@@ -72,6 +72,6 @@ REPLACE_FOR_CLIENTS(CFLAGS "[DU]DBUG_OFF" "[DU]SAFE_MUTEX" "[DU]NDEBUG"
"xstrconst" "xc99=none" "AC99" "restrict" "W[-A-Za-z]*=[-A-Za-z0-9]*")

# Same for --libs
REPLACE_FOR_CLIENTS(LIBS lmtmalloc static-libcxa i-static static-intel)
REPLACE_FOR_CLIENTS(LIBS "Wl,[^ ]*" lmtmalloc static-libcxa i-static static-intel)
REPLACE_FOR_CLIENTS(EMB_LIBS lmtmalloc static-libcxa i-static static-intel)

0 comments on commit 186075a

Please sign in to comment.
You can’t perform that action at this time.