aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorWilliam Woodruff2017-03-12 17:15:18 -0400
committerGitHub2017-03-12 17:15:18 -0400
commit29358232515f6480c16f09af3a23557f45a5a2f3 (patch)
tree836404c952d6897114d9f8775ab6b1c65d612f2b /Library
parentc67c338a061735fe01142017f6b14e8200d94b8c (diff)
parent0dda8a13f11810c78b7a5b67a798d757804a9952 (diff)
downloadbrew-29358232515f6480c16f09af3a23557f45a5a2f3.tar.bz2
Merge pull request #2324 from woodruffw/skip-pointless-relocations
keg: Skip relocation when dylib ID/install name doesn't change.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/os/mac/keg.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/Library/Homebrew/os/mac/keg.rb b/Library/Homebrew/os/mac/keg.rb
index 674ea3330..6caadb1d7 100644
--- a/Library/Homebrew/os/mac/keg.rb
+++ b/Library/Homebrew/os/mac/keg.rb
@@ -1,5 +1,6 @@
class Keg
def change_dylib_id(id, file)
+ return if file.dylib_id == id
@require_relocation = true
puts "Changing dylib ID of #{file}\n from #{file.dylib_id}\n to #{id}" if ARGV.debug?
MachO::Tools.change_dylib_id(file, id, strict: false)
@@ -13,6 +14,7 @@ class Keg
end
def change_install_name(old, new, file)
+ return if old == new
@require_relocation = true
puts "Changing install name in #{file}\n from #{old}\n to #{new}" if ARGV.debug?
MachO::Tools.change_install_name(file, old, new, strict: false)