summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorYuqi <yuqi.gu@arm.com>2018-06-01 18:06:01 +0800
committerSergey Vojtovich <svoj@mariadb.org>2018-06-01 14:06:01 +0400
commitee5124d714ea01f4e1bd6decf6da38b05c1009ad (patch)
tree8a8599fdebc6455ac0fc02b8fba785f16701e7b7 /libmysqld
parentdb677cc6efbb8a58969e83843890c72e2441a6e3 (diff)
downloadmariadb-git-ee5124d714ea01f4e1bd6decf6da38b05c1009ad.tar.gz
Make MariaDB CRC32-lib platform independence (#780)
Make mariadb crc32 lib platform independent It looks strange that someone can make use of 2 crc libraries (Power64 or AArch64) at the same time. The patch sets macros 'CRC32_LIBRARY' to make platform independence as an optional crc32 library. Change-Id: I68bbf73cafb6a12f7fb105ad57d117b114a8c4af Signed-off-by: Yuqi Gu <yuqi.gu@arm.com>
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index fe20a03e12d..f1fcfac58f5 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -445,9 +445,9 @@ IF(NOT DISABLE_SHARED)
# Clean direct output flags, as 2 targets have the same base name
# libmysqld
SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)
- TARGET_LINK_LIBRARIES(libmysqld ${CRC32_VPMSUM_LIBRARY})
+ TARGET_LINK_LIBRARIES(libmysqld ${CRC32_LIBRARY})
SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1)
- TARGET_LINK_LIBRARIES(mysqlserver ${CRC32_VPMSUM_LIBRARY})
+ TARGET_LINK_LIBRARIES(mysqlserver ${CRC32_LIBRARY})
IF(LIBMYSQLD_SO_EXTRA_LIBS)
TARGET_LINK_LIBRARIES(libmysqld ${LIBMYSQLD_SO_EXTRA_LIBS})
ENDIF()