summaryrefslogtreecommitdiff
path: root/storage/mroonga
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-21 14:57:00 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-21 14:57:00 +0300
commit489ef007bec398c3b7b628325b225c3a015922cf (patch)
tree7d1d5b1ea2c55d608f8697377776b9777fa622be /storage/mroonga
parentd10c42b42541deed899dd1d1e04b69475339196c (diff)
parentd5bcccdabbf1a23c75ab4ee0c14149eb6ed27d98 (diff)
downloadmariadb-git-489ef007bec398c3b7b628325b225c3a015922cf.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'storage/mroonga')
-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}