Merge pull request #1488 from MikeMcQuaid/filter-formula-options

Filter formula build options based on those that exist.

2 files changed, 2 insertions, 0 deletions

diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb
index 618835d74..598286562 100644
--- a/Library/Homebrew/cmd/reinstall.rb
+++ b/Library/Homebrew/cmd/reinstall.rb
@@ -22,6 +22,7 @@ module Homebrew
   def reinstall_formula(f)
     options = BuildOptions.new(Options.create(ARGV.flags_only), f.options).used_options
     options |= f.build.used_options
+    options &= f.options
 
     notice  = "Reinstalling #{f.full_name}"
     notice += " with #{options * ", "}" unless options.empty?
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 40805b4ca..f92832aa2 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -96,6 +96,7 @@ module Homebrew
 
     fi = FormulaInstaller.new(f)
     fi.options             = f.build.used_options
+    fi.options            &= f.options
     fi.build_bottle        = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?)
     fi.build_from_source   = ARGV.build_from_source? || ARGV.build_all_from_source?
     fi.verbose             = ARGV.verbose?