Merge pull request #15761 from carlocab/macho-todo

Implement ruby-macho TODOs
Homebrew · Jul 26, 2023 · 302e68e · 302e68e
2 parents 3dfa8bc + 6b728bf
commit 302e68e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/Library/Homebrew/extend/os/mac/keg_relocate.rb b/Library/Homebrew/extend/os/mac/keg_relocate.rb
@@ -59,8 +59,6 @@ def fix_dynamic_linkage
           new_name = opt_name_for(bad_name)
           loader_name = loader_name_for(file, new_name)
           next if loader_name == bad_name
-          # TODO: Remove the line below on the next release of ruby-macho. See Homebrew/ruby-macho@e9eaa75.
-          next if file.rpaths(resolve_variable_references: false).include?(loader_name)
 
           change_rpath(bad_name, loader_name, file)
         end

diff --git a/Library/Homebrew/os/mac/mach.rb b/Library/Homebrew/os/mac/mach.rb
@@ -64,11 +64,11 @@ def delete_rpath(rpath, **options)
       resolve_variable_name(r.path.to_s) == resolve_variable_name(rpath)
     end
 
-    # TODO: Add `last: true` to `options` and replace `delete_command` with `delete_rpath`
-    #       when the PR linked below is merged and release for ruby-macho.
-    # https://github.com/Homebrew/ruby-macho/pull/555
-    command_to_delete = candidates.last # .path.to_s (when switching to `MachOFile#delete_rpath`)
-    macho.delete_command(command_to_delete, options)
+    # Delete the last instance to avoid changing the order in which rpaths are searched.
+    rpath_to_delete = candidates.last.path.to_s
+    options[:last] = true
+
+    macho.delete_rpath(rpath_to_delete, options)
     macho.write!
   end