admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Revert "diagnostic: improve check for 'install_name_tool'"

Browse Source 
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.
This commit is contained in:
Martin Afanasjew 2016-04-09 14:16:06 +02:00
parent 1d9977b7c1
commit eb137dc924
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/diagnostic.rb
View File

@ -466,15 +466,13 @@ module Homebrew
def check_for_bad_install_name_tool def check_for_bad_install_name_tool
return if MacOS.version < "10.9" return if MacOS.version < "10.9"
install_name_tool = OS::Mac.install_name_tool libs = Pathname.new("/usr/bin/install_name_tool").dynamically_linked_libraries
libs = Pathname.new(install_name_tool).dynamically_linked_libraries
# otool may not work, for example if the Xcode license hasn't been accepted yet # otool may not work, for example if the Xcode license hasn't been accepted yet
return if libs.empty? return if libs.empty?
expectedLibs = ["/usr/lib/libSystem.B.dylib", "/usr/lib/libxcselect.dylib"] unless libs.include? "/usr/lib/libxcselect.dylib" then <<-EOS.undent
if (libs & expectedLibs).empty? then <<-EOS.undent You have an outdated version of /usr/bin/install_name_tool installed.
You have an outdated version of #{install_name_tool} installed.
This will cause binary package installations to fail. This will cause binary package installations to fail.
This can happen if you install osx-gcc-installer or RailsInstaller. This can happen if you install osx-gcc-installer or RailsInstaller.
To restore it, you must reinstall OS X or restore the binary from To restore it, you must reinstall OS X or restore the binary from