Merge pull request Homebrew#1275 from woodruffw/goodbye-cctools

formula_installer: Remove obsolete hard dependency on cctools.
n054 · Oct 15, 2016 · 1327640 · 1327640
2 parents ac50ffc + 5163aa5
commit 1327640
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 28 deletions.
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
@@ -12,7 +12,6 @@
 require "hooks/bottles"
 require "debrew"
 require "sandbox"
-require "requirements/cctools_requirement"
 require "emoji"
 require "development_tools"
 
@@ -234,7 +233,6 @@ def install
     pour_bottle = pour_bottle?(warn: true)
     if pour_bottle
       begin
-        install_relocation_tools unless formula.bottle_specification.skip_relocation?
         pour
       rescue Exception => e
         # any exceptions must leave us with nothing installed
@@ -434,19 +432,6 @@ def install_dependencies(deps)
     @show_header = true unless deps.empty?
   end
 
-  # Installs the relocation tools (as provided by the cctools formula) as a hard
-  # dependency for every formula installed from a bottle when the user has no
-  # developer tools. Invoked unless the formula explicitly sets
-  # :any_skip_relocation in its bottle DSL.
-  def install_relocation_tools
-    cctools = CctoolsRequirement.new
-    dependency = cctools.to_dependency
-    formula = dependency.to_formula
-    return if cctools.satisfied? || @@attempted.include?(formula)
-
-    install_dependency(dependency, inherited_options_for(cctools))
-  end
-
   class DependencyInstaller < FormulaInstaller
     def skip_deps_check?
       true

diff --git a/Library/Homebrew/requirements/cctools_requirement.rb b/Library/Homebrew/requirements/cctools_requirement.rb