diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-06-30 16:31:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 17:15:59 +0200 |
| commit | 186075adf285725be1c8ca6f668addccf76b4f95 (patch) | |
| tree | 2c6ddd2629ca652eacb87829e6a2ebcda0e5b935 /cmake | |
| parent | d2d52305b45dc02fd8b9520569b18ccc7f5d196b (diff) | |
| download | mariadb-git-186075adf285725be1c8ca6f668addccf76b4f95.tar.gz | |
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)
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/for_clients.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/for_clients.cmake b/cmake/for_clients.cmake index 636610e7fba..e5916c56ddc 100644 --- a/cmake/for_clients.cmake +++ b/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) |