milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'branch-0.3.0' into 'branch-0.3.0' 

MS-90 Fix arch match incorrect on ARM

See merge request megasearch/vecwise_engine!98

Former-commit-id: 1a736a212f4a041974029102cb1458aac50eff06
pull/191/head
jinhai 2019-06-17 18:56:09 +08:00
parent c525a892f9 d35b51f564
commit 031ae03841
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpp/CHANGELOG.md
View File

@ -7,6 +7,7 @@ Please mark all change in change log and use the ticket from JIRA.
## Bug ## Bug
- MS-80 - Fix server hang issue - MS-80 - Fix server hang issue
- MS-89 - Fix compile failed, libgpufaiss.a link missing - MS-89 - Fix compile failed, libgpufaiss.a link missing
- MS-90 - Fix arch match incorrect on ARM
## Improvement ## Improvement
- MS-82 - Update server startup welcome message - MS-82 - Update server startup welcome message

3
cpp/src/CMakeLists.txt
View File

@ -102,7 +102,8 @@ else()
) )
endif () endif ()
if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
set(engine_libs set(engine_libs
${engine_libs} ${engine_libs}
libquadmath.a libquadmath.a