Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg] Fix Mach-O RPATH duplicate or empty values ​​on macOS #41146

Closed
wants to merge 5 commits into from
+23 −21
Closed

[vcpkg] Fix Mach-O RPATH duplicate or empty values ​​on macOS #41146

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
80d31d3
[vcpkg] Fix Mach-O RPATH duplicate or empty values ​​on macOS
FrankXie05 Sep 24, 2024
8d45118
update
FrankXie05 Sep 24, 2024
7fa3187
update
FrankXie05 Sep 26, 2024
de18a9a
Accept suggestions
FrankXie05 Sep 27, 2024
6271c9b
Update z_vcpkg_fixup_rpath_macho.cmake
FrankXie05 Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions scripts/cmake/z_vcpkg_fixup_rpath_macho.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,33 +132,35 @@ function(z_vcpkg_fixup_macho_rpath_in_dir)
string(REGEX MATCHALL "rpath [^\n]+" get_rpath_ov "${get_rpath_ov}")
string(REGEX REPLACE "rpath " "" rpath_list "${get_rpath_ov}")

list(FIND rpath_list "${new_rpath}" has_new_rpath)
if(NOT has_new_rpath EQUAL -1)
list(REMOVE_AT rpath_list ${has_new_rpath})
set(rpath_args)
else()
set(rpath_args -add_rpath "${new_rpath}")
endif()
set(rpath_args "")
set(found_new_rpath FALSE)

foreach(rpath IN LISTS rpath_list)
list(APPEND rpath_args "-delete_rpath" "${rpath}")
if(rpath STREQUAL new_rpath)
set(found_new_rpath TRUE)
else()
list(APPEND rpath_args "-delete_rpath" "${rpath}")
endif()
endforeach()
if(rpath_args STREQUAL "")
continue()

if(NOT found_new_rpath)
list(APPEND rpath_args "-add_rpath" "${new_rpath}")
endif()

# Set the new rpath
execute_process(
COMMAND "${install_name_tool_cmd}" ${rpath_args} "${macho_file}"
OUTPUT_QUIET
ERROR_VARIABLE set_rpath_error
)
if(NOT "${rpath_args}" STREQUAL "")
execute_process(
COMMAND "${install_name_tool_cmd}" ${rpath_args} "${macho_file}"
OUTPUT_QUIET
ERROR_VARIABLE set_rpath_error
)

if(NOT "${set_rpath_error}" STREQUAL "")
message(WARNING "Couldn't adjust RPATH of '${macho_file}': ${set_rpath_error}")
continue()
endif()
if(NOT "${set_rpath_error}" STREQUAL "")
message(WARNING "Couldn't adjust RPATH of '${macho_file}': ${set_rpath_error}")
continue()
endif()

message(STATUS "Adjusted RPATH of '${macho_file}' to '${new_rpath}'")
message(STATUS "Adjusted RPATH of '${macho_file}' to '${new_rpath}'")
endif()
endforeach()
endforeach()
endfunction()