diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-10-29 13:03:08 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-10-29 13:03:08 +0100 |
| commit | 0697d75cd052e809b05cc3e812f5e48209c04b4c (patch) | |
| tree | 16524035d92e3d78dc27db00dbc30198aa84db78 /storage/mroonga | |
| parent | f6549e95448e5cce52336361f5a59d1edcdac46a (diff) | |
| parent | c05e571e7d53ba11a3422490cff0d93e6691ea62 (diff) | |
| download | mariadb-git-10.5-merge.tar.gz | |
Merge commit 'c05e571e7d53ba11a3422490cff0d93e6691ea62' into HEAD10.5-merge
Diffstat (limited to 'storage/mroonga')
| -rw-r--r-- | storage/mroonga/vendor/groonga/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/mroonga/vendor/groonga/lib/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/storage/mroonga/vendor/groonga/CMakeLists.txt b/storage/mroonga/vendor/groonga/CMakeLists.txt index 564e859d146..d271d4c4eb9 100644 --- a/storage/mroonga/vendor/groonga/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/CMakeLists.txt @@ -240,7 +240,6 @@ include(build/ac_macros/check_functions.m4) ac_check_symbols(fpclassify math.h) ac_check_lib(m fpclassify) -ac_check_lib(dl dlopen) ac_check_lib(execinfo backtrace) if(HAVE_LIBEXECINFO) set(HAVE_BACKTRACE TRUE) diff --git a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt index 21628b26ce2..8c71563f722 100644 --- a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt @@ -97,7 +97,7 @@ set(GRN_ALL_LIBRARIES ${LZ4_LIBS} ${LIBZSTD_LIBS} ${MESSAGE_PACK_LIBS} - ${DL_LIBS} + ${CMAKE_DL_LIBS} ${M_LIBS} ${WS2_32_LIBS} ${MRUBY_LIBS} |