aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
authorMike McQuaid2012-08-25 13:08:24 -0700
committerMike McQuaid2012-08-25 13:08:46 -0700
commit67f78074f9fe0dc9b00bc499e8f66c069c2ab35c (patch)
treebea950e1da353ccff89db77fadc9107b0b31a73f /Library/Homebrew/extend
parent82d1310800dc225e8c561fb07c76a1e85434fdd4 (diff)
downloadbrew-67f78074f9fe0dc9b00bc499e8f66c069c2ab35c.tar.bz2
Miscellaneous bottle code cleanup.
Diffstat (limited to 'Library/Homebrew/extend')
-rw-r--r--Library/Homebrew/extend/ARGV.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 4d8663394..694850df2 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -124,16 +124,8 @@ module HomebrewArgvExtension
include? '--32-bit'
end
- def bottles_supported?
- # Snow Leopard was the only version of OS X that supported
- # both 64-bit and 32-bit processors and kernels.
- (Hardware.is_64_bit? or not MacOS.snow_leopard?) \
- and HOMEBREW_PREFIX.to_s == '/usr/local' \
- and HOMEBREW_CELLAR.to_s == '/usr/local/Cellar' \
- end
-
def build_bottle?
- include? '--build-bottle' and bottles_supported?
+ include? '--build-bottle' and MacOS.bottles_supported?
end
def build_from_source?