diff options
| author | Robert Bindar <robert@mariadb.org> | 2021-07-02 09:34:25 +0300 |
|---|---|---|
| committer | Robert Bindar <robert@mariadb.org> | 2021-07-12 12:42:30 +0300 |
| commit | b082716892071fdc3c961e9afaa011e0f6beb102 (patch) | |
| tree | 5f1714a08a79a40101645f9da049a990e78af91b /cmake | |
| parent | fb0b28932ce82903f2fcfb690a71bff52355507f (diff) | |
| download | mariadb-git-b082716892071fdc3c961e9afaa011e0f6beb102.tar.gz | |
MDEV-21206 Can't link zlib library during DBD::mysql installation
mysql_config should never return -lzlib as linking flag.
Clients trying to link against mariadb that use the output of
mysql_config experience linking error because we return -lzlib
when we don't ship any libzlib.a in our binary tarballs, bundled
zlib static library is already linked.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/for_clients.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/for_clients.cmake b/cmake/for_clients.cmake index e5916c56ddc..e52e3b34f21 100644 --- a/cmake/for_clients.cmake +++ b/cmake/for_clients.cmake @@ -24,7 +24,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) FOREACH(lib ${${target}_LIB_DEPENDS}) # Filter out "general", it is not a library, just CMake hint # Also, remove duplicates - IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ") + IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "zlib") IF (lib MATCHES "^\\-") SET(${var} "${${var}} ${lib} ") ELSEIF(lib MATCHES "^/") |