summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2021-10-29 16:42:45 +1100
committerDaniel Black <daniel@mariadb.org>2021-10-29 16:42:48 +1100
commit3f3f2083c4188860f2881f379e953eace5bfc2c9 (patch)
treeb393f5155f51b72c686fdfcaa367c74be16ae2b0
parent1fdac574470a5103dde689c8ce65041487e77f2c (diff)
downloadmariadb-git-bb-10.4-danielblack-atomic-rhel-aarch-fix.tar.gz
plugin query_reponse_time - link to atomicbb-10.4-danielblack-atomic-rhel-aarch-fix
Notable by: main.plugin_vars w7 [ fail ] Test ended at 2021-10-28 17:43:48 CURRENT_TEST: main.plugin_vars mysqltest: At line 70: query 'install plugin query_response_time soname 'query_response_time'' failed: 1126: Can't open shared library '/buildbot/aarch64-rhel-8/build/mysql-test/var/plugins/query_response_time.so' (errno: 11, undefined symbol: __aarch64_ldadd4_relax) Fixes: f502ccbcb5dfce29067434885a23db8d1bd5f134
-rw-r--r--plugin/query_response_time/CMakeLists.txt11
1 files changed, 9 insertions, 2 deletions
diff --git a/plugin/query_response_time/CMakeLists.txt b/plugin/query_response_time/CMakeLists.txt
index 112d72e429a..b10e68a35e1 100644
--- a/plugin/query_response_time/CMakeLists.txt
+++ b/plugin/query_response_time/CMakeLists.txt
@@ -1,3 +1,10 @@
ADD_DEFINITIONS(-DHAVE_RESPONSE_TIME_DISTRIBUTION)
-MYSQL_ADD_PLUGIN(QUERY_RESPONSE_TIME query_response_time.cc plugin.cc
- RECOMPILE_FOR_EMBEDDED)
+
+if (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
+ MYSQL_ADD_PLUGIN(QUERY_RESPONSE_TIME query_response_time.cc plugin.cc
+ LINK_LIBRARIES atomic
+ RECOMPILE_FOR_EMBEDDED)
+else()
+ MYSQL_ADD_PLUGIN(QUERY_RESPONSE_TIME query_response_time.cc plugin.cc
+ RECOMPILE_FOR_EMBEDDED)
+endif()