Skip to content
Snippets Groups Projects
Commit 71513264 authored by Mike McQuaid's avatar Mike McQuaid Committed by GitHub
Browse files

Revert "keg_relocate: Don't relocate dylib IDs containing metavariables."

parent 2ba53eb2
No related branches found
No related tags found
No related merge requests found
......@@ -78,19 +78,13 @@ class Keg
end
end
def filename_contains_metavariable?(fn)
fn =~ /^@(loader_|executable_|r)path/
end
def each_install_name_for(file, &block)
dylibs = file.dynamically_linked_libraries
dylibs.reject! { |fn| filename_contains_metavariable?(fn) }
dylibs.reject! { |fn| fn =~ /^@(loader_|executable_|r)path/ }
dylibs.each(&block)
end
def dylib_id_for(file)
return file.dylib_id if filename_contains_metavariable?(file.dylib_id)
# The new dylib ID should have the same basename as the old dylib ID, not
# the basename of the file itself.
basename = File.basename(file.dylib_id)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment