diff options
| author | Mike McQuaid | 2017-04-04 13:29:27 +0100 |
|---|---|---|
| committer | GitHub | 2017-04-04 13:29:27 +0100 |
| commit | 715132642fa6e9a418636f99a65eecde46d36ab5 (patch) | |
| tree | ca1b62c0e21531de6baa3cd6bb0c876f1d217673 /Library | |
| parent | 2ba53eb272ec56d806bcdc62b02a8ab1b3c92e52 (diff) | |
| download | brew-715132642fa6e9a418636f99a65eecde46d36ab5.tar.bz2 | |
Revert "keg_relocate: Don't relocate dylib IDs containing metavariables."
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/os/mac/keg_relocate.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Library/Homebrew/extend/os/mac/keg_relocate.rb b/Library/Homebrew/extend/os/mac/keg_relocate.rb index 476e5da4a..f44a97b31 100644 --- a/Library/Homebrew/extend/os/mac/keg_relocate.rb +++ b/Library/Homebrew/extend/os/mac/keg_relocate.rb @@ -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) |
