summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <cvicentiu@gmail.com>2021-10-19 19:20:23 +0300
committerVicențiu Ciorbaru <cvicentiu@gmail.com>2021-10-19 19:22:54 +0300
commit1388845e048011932a6d715936a781479c5e6af3 (patch)
tree5fcbfbf1f0c8caa63a672285f0e7b5523f66e8fe
parenta33c1082dab7ab4b08acf957d6364be95e4c6a9f (diff)
downloadmariadb-git-1388845e048011932a6d715936a781479c5e6af3.tar.gz
Fix Groonga crash on MIPS: Correctly link to libatomic
MIPS (and possibly other) platforms require linking against libatomic to support 64-bit atomic integers. Groonga was failing to do so and all related tests were failing with an atomics relocation error on MIPS. Contributors: James Cowgill <jcowgill@debian.org>
-rw-r--r--storage/mroonga/vendor/groonga/lib/CMakeLists.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
index 8c71563f722..4f076458a36 100644
--- a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
+++ b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
@@ -89,7 +89,12 @@ else()
endif()
set_target_properties(libgroonga PROPERTIES OUTPUT_NAME "groonga")
+if (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
+ set(ATOMIC_LIBS atomic)
+endif()
+
set(GRN_ALL_LIBRARIES
+ ${ATOMIC_LIBS}
${EXECINFO_LIBS}
${RT_LIBS}
${PTHREAD_LIBS}