From eb137dc9248cf3b975b35fae2226c45d3dd9a0ab Mon Sep 17 00:00:00 2001 From: Martin Afanasjew Date: Sat, 9 Apr 2016 14:16:06 +0200 Subject: [PATCH] Revert "diagnostic: improve check for 'install_name_tool'" This reverts commit 9f79c05656a44f926898774c6029025002bcd621. Restore check to continue to inspect `/usr/bin/install_name_tool`. See Homebrew/legacy-homebrew#50091 and Homebrew/legacy-homebrew#50509 for the full context and more details. --- Library/Homebrew/diagnostic.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index f42d8b28e0..cd5acf5aa7 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -466,15 +466,13 @@ module Homebrew def check_for_bad_install_name_tool return if MacOS.version < "10.9" - install_name_tool = OS::Mac.install_name_tool - libs = Pathname.new(install_name_tool).dynamically_linked_libraries + libs = Pathname.new("/usr/bin/install_name_tool").dynamically_linked_libraries # otool may not work, for example if the Xcode license hasn't been accepted yet return if libs.empty? - expectedLibs = ["/usr/lib/libSystem.B.dylib", "/usr/lib/libxcselect.dylib"] - if (libs & expectedLibs).empty? then <<-EOS.undent - You have an outdated version of #{install_name_tool} installed. + unless libs.include? "/usr/lib/libxcselect.dylib" then <<-EOS.undent + You have an outdated version of /usr/bin/install_name_tool installed. This will cause binary package installations to fail. This can happen if you install osx-gcc-installer or RailsInstaller. To restore it, you must reinstall OS X or restore the binary from