test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-11-30 02:48:45 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fix compile on M1 (#21298)

Browse Source 
Signed-off-by: Enwei Jiao <enwei.jiao@zilliz.com>

Signed-off-by: Enwei Jiao <enwei.jiao@zilliz.com>
This commit is contained in:
Enwei Jiao 2022-12-19 15:05:24 +08:00 committed by GitHub
parent d7cbb58e4a
commit ae41a6583f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/core/conanfile.py
View File

@ -34,6 +34,11 @@ class MilvusConan(ConanFile):
}
should_build = False
def configure(self):
# Macos M1 cannot use jemalloc
if self.settings.os == "Macos" and self.settings.arch not in ("x86_64", "x86"):
self.options["arrow"].with_jemalloc = False
def imports(self):
self.copy("librocksdb.a", "../lib", "lib")
self.copy("libarrow.a", "../lib", "lib")

24
scripts/core_build.sh
View File

@ -187,33 +187,17 @@ case "${unameOut}" in
export CXX="${llvm_prefix}/bin/clang++"
export LDFLAGS="-L${llvm_prefix}/lib -L/usr/local/opt/libomp/lib"
export CXXFLAGS="-I${llvm_prefix}/include -I/usr/local/include -I/usr/local/opt/libomp/include"
conan install ${CPP_SRC_DIR} --install-folder conan --build=missing -s compiler=clang -s compiler.libcxx=libc++
conan install ${CPP_SRC_DIR} --install-folder conan --build=missing -s compiler=clang -s compiler.libcxx=libc++ || { echo 'conan install failed'; exit 1; }
;;
Linux*)
if [[ `gcc -v 2>&1 | sed -n 's/.*\(--with-default-libstdcxx-abi\)=\(\w*\).*/\2/p'` == "gcc4" ]]; then
conan install ${CPP_SRC_DIR} --install-folder conan --build=missing
conan install ${CPP_SRC_DIR} --install-folder conan --build=missing || { echo 'conan install failed'; exit 1; }
else
conan install ${CPP_SRC_DIR} --install-folder conan --build=missing -s compiler.libcxx=libstdc++11
conan install ${CPP_SRC_DIR} --install-folder conan --build=missing -s compiler.libcxx=libstdc++11 || { echo 'conan install failed'; exit 1; }
fi
;;
*)
cat << EOF >> msys2_profile
[tool_requires]
mingw-w64/8.1
[settings]
os_build=Windows
os=Windows
arch=x86_64
arch_build=x86_64
compiler=gcc
compiler.version=8.4
compiler.exception=seh
compiler.libcxx=libstdc++11
compiler.threads=posix
build_type=Release
EOF
conan install ${CPP_SRC_DIR} --install-folder conan --build=missing --profile msys2_profile
echo "Cannot build on windows"
;;
esac