Give this condition a more revealing name

2 files changed, 7 insertions, 1 deletions

diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index 47aa75ffc..5736aeea3 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -17,7 +17,7 @@ def install_bottle? f, options={:warn=>false}
   return false if ARGV.build_from_source?
   return true if ARGV.force_bottle?
   return false unless f.pour_bottle?
-  return false unless f.build.used_options.empty?
+  return false unless f.default_build?
   return false unless bottle_current?(f)
   if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s
     if options[:warn]
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 6b14aba25..10e546d2f 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -88,6 +88,12 @@ class Formula
     end
   end
 
+  def default_build?
+    build = self.class.build.dup
+    build.concat(stable.options)
+    build.used_options.empty?
+  end
+
   def url;      active_spec.url;     end
   def version;  active_spec.version; end
   def mirrors;  active_spec.mirrors; end