Merge pull request #1641 from MikeMcQuaid/formulary-remap-options

formulary: remap deprecated options from keg.

2 files changed, 1 insertions, 1 deletions

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 19b619625..1eae668a4 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -467,7 +467,6 @@ class FormulaInstaller
 
     fi = DependencyInstaller.new(df)
     fi.options           |= tab.used_options
-    fi.options           |= Tab.remap_deprecated_options(df.deprecated_options, dep.options)
     fi.options           |= inherited_options
     fi.options           &= df.options
     fi.build_from_source  = ARGV.build_formula_from_source?(df)
diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index 772f4c902..8d9633e3c 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -276,6 +276,7 @@ class Formulary
       end
     end
     f.build = tab
+    f.build.used_options = Tab.remap_deprecated_options(f.deprecated_options, tab.used_options).as_flags
     f.version.update_commit(keg.version.version.commit) if f.head? && keg.version.head?
     f
   end