admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #15864 from carlocab/fat-rpaths

Browse Source 
os/mac/mach: fix rpath deletion of fat machos
This commit is contained in:
Carlo Cabrera 2023-08-14 14:43:48 +08:00 committed by GitHub
commit b8b46501e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/os/mac/mach.rb
View File

@ -60,12 +60,12 @@ module MachOShim
# TODO: See if the `#write!` call can be delayed until # TODO: See if the `#write!` call can be delayed until
# we know we're not making any changes to the rpaths. # we know we're not making any changes to the rpaths.
def delete_rpath(rpath, **options) def delete_rpath(rpath, **options)
candidates = macho.command(:LC_RPATH).select do |r| candidates = rpaths(resolve_variable_references: false).select do |r|
resolve_variable_name(r.path.to_s) == resolve_variable_name(rpath) resolve_variable_name(r) == resolve_variable_name(rpath)
end end
# Delete the last instance to avoid changing the order in which rpaths are searched. # Delete the last instance to avoid changing the order in which rpaths are searched.
rpath_to_delete = candidates.last.path.to_s rpath_to_delete = candidates.last
options[:last] = true options[:last] = true
macho.delete_rpath(rpath_to_delete, options) macho.delete_rpath(rpath_to_delete, options)