From ccf37d5ac021ca098ed73e290ca518628b4a1aba Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 24 Aug 2014 16:14:16 -0500 Subject: Revert "Use the dependency object as the key in the inherited_options hash" This reverts commit c8d3b39165bb11799d7849ee13a3559ad0bd63f4. --- Library/Homebrew/formula_installer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Library/Homebrew') diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index debaffe87..dea717eda 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -278,7 +278,7 @@ class FormulaInstaller inherited_options = {} expanded_deps = Dependency.expand(f, deps) do |dependent, dep| - options = inherited_options[dep] = inherited_options_for(dep) + options = inherited_options[dep.name] = inherited_options_for(dep) build = effective_build_options_for( dependent, inherited_options.fetch(dependent.name, []) @@ -295,7 +295,7 @@ class FormulaInstaller end end - expanded_deps.map { |dep| [dep, inherited_options[dep]] } + expanded_deps.map { |dep| [dep, inherited_options[dep.name]] } end def effective_build_options_for(dependent, inherited_options=[]) -- cgit v1.2.3