From 041060e28fa0e0c6ed6995ec34bb62188f159d2a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 1 Mar 2013 17:44:58 +0000 Subject: Support 32-bit 10.6 bottles. Closes #17735. Signed-off-by: Mike McQuaid --- Library/Homebrew/macos.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'Library/Homebrew/macos.rb') diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb index bc886ce4b..dae0a1126 100644 --- a/Library/Homebrew/macos.rb +++ b/Library/Homebrew/macos.rb @@ -11,7 +11,8 @@ module MacOS extend self def cat if version == :mountain_lion then :mountain_lion elsif version == :lion then :lion - elsif version == :snow_leopard then :snow_leopard + elsif version == :snow_leopard + Hardware.is_64_bit? ? :snow_leopard : :snow_leopard_32 elsif version == :leopard then :leopard else nil end @@ -234,16 +235,6 @@ module MacOS extend self def pkgutil_info id `/usr/sbin/pkgutil --pkg-info "#{id}" 2>/dev/null`.strip end - - def bottles_supported? raise_if_failed=false - # We support bottles on all versions of OS X except 32-bit Snow Leopard. - if Hardware.is_32_bit? and MacOS.version == :snow_leopard - return false unless raise_if_failed - raise "Bottles are not supported on 32-bit Snow Leopard." - end - - true - end end require 'macos/xcode' -- cgit v1.2.3