furyhawk/milvus
1
0
Fork 0
mirror of https://github.com/milvus-io/milvus.git synced 2026-07-21 10:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: mac14 compile (#46907)

Browse Source 
fix: #46906

Signed-off-by: xiaofanluan <xiaofan.luan@zilliz.com>
This commit is contained in:
Xiaofan
2026-01-08 14:27:25 +08:00
committed by GitHub
parent b25106b7dd
commit 5f8a531b13
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+4 -2
View File
@@ -26,8 +26,10 @@ mode = Release
# macOS (Darwin) does not support aio, so disable disk_index
ifeq ($(OS),Darwin)
use_disk_index = OFF
planparser_rpath_flag = -Wl,-rpath,@loader_path
else
use_disk_index = ON
planparser_rpath_flag = -Wl,-rpath,'$$ORIGIN'
endif
# Allow manual override via disk_index variable
@@ -406,10 +408,10 @@ plan-parser-so:
GO111MODULE=on $(GO) build -buildmode=c-shared -o $(PWD)/internal/core/output/lib/libmilvus-planparser.so $(PWD)/internal/parser/planparserv2/cwrapper/wrapper.go && \
mv $(PWD)/internal/core/output/lib/libmilvus-planparser.h $(PWD)/internal/core/output/include/libmilvus-planparser.h && \
cp $(PWD)/internal/parser/planparserv2/cwrapper/milvus_plan_parser.h $(PWD)/internal/core/output/include/ && \
g++ -shared -fPIC -o $(PWD)/internal/core/output/lib/libmilvus-planparser-cpp.so $(PWD)/internal/parser/planparserv2/cwrapper/milvus_plan_parser.cpp \
g++ -std=c++17 -shared -fPIC -o $(PWD)/internal/core/output/lib/libmilvus-planparser-cpp.so $(PWD)/internal/parser/planparserv2/cwrapper/milvus_plan_parser.cpp \
-I$(PWD)/internal/core/output/include \
-L$(PWD)/internal/core/output/lib -lmilvus-planparser \
-Wl,-rpath,'$$ORIGIN'
$(planparser_rpath_flag)
# Run code coverage.
codecov: codecov-go codecov-cpp
internal/core/CMakeLists.txt
+4
View File
@@ -160,6 +160,10 @@ if ( APPLE )
"-Wno-c++11-narrowing"
"-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED=1"
)
# Fix for macOS 14+ (Sonoma) linker requiring SG_READ_ONLY flag
# Disable fixup chains to avoid __DATA_CONST segment issues with third-party libraries
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_fixup_chains")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-no_fixup_chains")
endif ()
# **************************** Coding style check tools ****************************