1 files changed, 6 insertions, 5 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 8503559d5..12e139de8 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -81,12 +81,13 @@ module HomebrewArgvExtension
     include? '--32-bit'
   end
 
+  def build_bottle?
+    MacOS.bottles_supported? and include? '--build-bottle'
+  end
+
   def build_from_source?
-    return true if flag? '--build-from-source' or ENV['HOMEBREW_BUILD_FROM_SOURCE'] \
-      or not MacOS.lion? or HOMEBREW_PREFIX.to_s != '/usr/local'
-    options = options_only
-    options.delete '--universal'
-    not options.empty?
+    flag? '--build-from-source' or ENV['HOMEBREW_BUILD_FROM_SOURCE'] \
+      or not MacOS.bottles_supported? or not options_only.empty?
   end
 
   def flag? flag