From 88c7e749b614a4b64a36611691cc7a2e2efc6a97 Mon Sep 17 00:00:00 2001 From: Xiangyu Wang Date: Mon, 17 Jun 2019 17:52:46 +0800 Subject: [PATCH] MS-90 Fix arch match incorrect on ARM Former-commit-id: b92c6b3ba3109490fa358a9bb123fc7dedea4854 --- cpp/CHANGELOG.md | 1 + cpp/src/CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index df9cd36e0a..90c73980f9 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -6,6 +6,7 @@ Please mark all change in change log and use the ticket from JIRA. ## Bug - MS-80 - Fix server hang issue +- MS-90 - Fix arch match incorrect on ARM ## Improvement - MS-82 - Update server startup welcome message diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index b7d33ea9ad..b4743de7cd 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -101,7 +101,8 @@ else() ) endif () -if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") + +if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") set(engine_libs ${engine_libs} libquadmath.a