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

Filter formula build options based on those that exist.

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?

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?

Library/Homebrew/formula_installer.rb

@@ -457,6 +457,7 @@ class FormulaInstaller
     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)
     fi.verbose            = verbose? && !quieter?
     fi.debug              = debug?