diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-06-18 14:19:49 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-07-04 18:19:52 +0200 |
| commit | 971bef89ab533b5a7975efc44bf12a38fb0b1624 (patch) | |
| tree | defc30815d7f322e01c5eb23e6cad70577f6fc7b /cmake | |
| parent | a099284b716b07af0d196705f44b828d621943d2 (diff) | |
| download | mariadb-git-971bef89ab533b5a7975efc44bf12a38fb0b1624.tar.gz | |
MDEV-19481 mariadb-10.3.15-linux-systemd-x86_64/bin/mysqld: /lib64/libstdc++.so.6: version `GLIBCXX_3.4.20' and 'GLIBCXX_3.4.21' not found
don't ignore LIBSYSTEMD_LDFLAGS when trying out systemd
(and put them in LIBSYSTEMD, because MYSQLD_LINK_FLAGS has stuff like
-lmtmalloc and is used only for mysqld, not for, say, explain_filename-t)
LIBSYSTEMD_LDFLAGS come from libsystemd.pc via pkg-config
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/systemd.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake index 89894e89f8a..23eb467f9b6 100644 --- a/cmake/systemd.cmake +++ b/cmake/systemd.cmake @@ -27,13 +27,9 @@ MACRO(CHECK_SYSTEMD) pkg_search_module(LIBSYSTEMD libsystemd libsystemd-daemon) ENDIF() IF(HAVE_DLOPEN) - SET(LIBSYSTEMD ${LIBSYSTEMD_LIBRARIES}) - #SET(CMAKE_REQUIRED_FLAGS ${LIBSYSTEMD_CFLAGS}) - SET(MYSQLD_LINK_FLAGS "${MYSQLD_LINK_FLAGS} ${LIBSYSTEMD_LDFLAGS}") + SET(LIBSYSTEMD ${LIBSYSTEMD_LDFLAGS} ${LIBSYSTEMD_LIBRARIES}) ELSE() - SET(LIBSYSTEMD ${LIBSYSTEMD_STATIC_LIBRARIES}) - #SET(CMAKE_REQUIRED_FLAGS ${LIBSYSTEMD_STATIC_CFLAGS}) - SET(MYSQLD_LINK_FLAGS "${MYSQLD_LINK_FLAGS} ${LIBSYSTEMD_STATIC_LDFLAGS}") + SET(LIBSYSTEMD ${LIBSYSTEMD_STATIC_LDFLAGS} ${LIBSYSTEMD_STATIC_LIBRARIES}) ENDIF() ELSE() SET(LIBSYSTEMD systemd) |