From 28c9330abb7812787ef17d8ba1befaef1d019a23 Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Mon, 21 Oct 2013 13:46:09 -0700 Subject: [PATCH] Update Leopard/Tiger bottle tags * PPC bottles are in the os_cpu format, e.g. :tiger_g3 * Intel bottles are the bare cat, as usual * 64-bit bottles have _64 appended to them, e.g. :tiger_g5_64 or :leopard_64 --- Library/Homebrew/bottles.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb index a8d1dee2d5..f82bbde902 100644 --- a/Library/Homebrew/bottles.rb +++ b/Library/Homebrew/bottles.rb @@ -81,7 +81,13 @@ def bottle_tag when "10.6" Hardware::CPU.is_64_bit? ? :snow_leopard : :snow_leopard_32 else - Hardware::CPU.type == :ppc ? Hardware::CPU.family : MacOS.cat + # Return, e.g., :tiger_g3, :leopard_g5_64, :leopard_64 (which is Intel) + if Hardware::CPU.type == :ppc + tag = "#{MacOS.cat}_#{Hardware::CPU.family}".to_sym + else + tag = MacOS.cat + end + MacOS.prefer_64_bit? ? "#{tag}_64".to_sym : tag end end