Remove old cctools references now that only ruby-macho is used.

4 files changed, 6 insertions, 26 deletions

diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
index 9676e374c..f4d6a463a 100644
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@@ -255,7 +255,7 @@ module Homebrew
           if prefix != prefix_check
             relocatable = false if keg_contain_absolute_symlink_starting_with?(prefix, keg)
           end
-          skip_relocation = relocatable && !keg.require_install_name_tool?
+          skip_relocation = relocatable && !keg.require_relocation?
         end
         puts if !relocatable && ARGV.verbose?
       rescue Interrupt
diff --git a/Library/Homebrew/extend/os/mac/keg_relocate.rb b/Library/Homebrew/extend/os/mac/keg_relocate.rb
index 61d54ba97..33ee149ce 100644
--- a/Library/Homebrew/extend/os/mac/keg_relocate.rb
+++ b/Library/Homebrew/extend/os/mac/keg_relocate.rb
@@ -124,7 +124,7 @@ class Keg
   end
 
   def self.file_linked_libraries(file, string)
-    # Check dynamic library linkage. Importantly, do not run otool on static
+    # Check dynamic library linkage. Importantly, do not perform for static
     # libraries, which will falsely report "linkage" to themselves.
     if file.mach_o_executable? || file.dylib? || file.mach_o_bundle?
       file.dynamically_linked_libraries.select { |lib| lib.include? string }
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index f121cbbd3..029c761f7 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -45,26 +45,6 @@ module OS
       @language ||= Utils.popen_read("defaults", "read", ".GlobalPreferences", "AppleLanguages").delete(" \n\"()").sub(/,.*/, "")
     end
 
-    # Locates a (working) copy of install_name_tool, guaranteed to function
-    # whether the user has developer tools installed or not.
-    def install_name_tool
-      if (path = HOMEBREW_PREFIX/"opt/cctools/bin/install_name_tool").executable?
-        path
-      else
-        DevelopmentTools.locate("install_name_tool")
-      end
-    end
-
-    # Locates a (working) copy of otool, guaranteed to function whether the user
-    # has developer tools installed or not.
-    def otool
-      if (path = HOMEBREW_PREFIX/"opt/cctools/bin/otool").executable?
-        path
-      else
-        DevelopmentTools.locate("otool")
-      end
-    end
-
     def active_developer_dir
       @active_developer_dir ||= Utils.popen_read("/usr/bin/xcode-select", "-print-path").strip
     end
diff --git a/Library/Homebrew/os/mac/keg.rb b/Library/Homebrew/os/mac/keg.rb
index 8505647a4..b2a769849 100644
--- a/Library/Homebrew/os/mac/keg.rb
+++ b/Library/Homebrew/os/mac/keg.rb
@@ -1,6 +1,6 @@
 class Keg
   def change_dylib_id(id, file)
-    @require_install_name_tool = true
+    @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)
   rescue MachO::MachOError
@@ -13,7 +13,7 @@ class Keg
   end
 
   def change_install_name(old, new, file)
-    @require_install_name_tool = true
+    @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)
   rescue MachO::MachOError
@@ -25,7 +25,7 @@ class Keg
     raise
   end
 
-  def require_install_name_tool?
-    @require_install_name_tool
+  def require_relocation?
+    @require_relocation
   end
 end