From fa03fd91b405c581fb57b8dc3b207b6226582ac3 Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Thu, 1 Aug 2013 19:46:56 -0700 Subject: [PATCH] Add MacOS.preferred_arch Replaced the plethora of ternaries we've used all over the place to determine whether x86_64 or i386 is called for. --- Library/Homebrew/macos.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb index 2e5c02f394..8e379ad2ac 100644 --- a/Library/Homebrew/macos.rb +++ b/Library/Homebrew/macos.rb @@ -188,6 +188,14 @@ module MacOS extend self Hardware::CPU.is_64_bit? and version != :leopard end + def preferred_arch + @preferred_arch ||= if prefer_64_bit? + Hardware::CPU.arch_64_bit + else + Hardware::CPU.arch_32_bit + end + end + STANDARD_COMPILERS = { "3.1.4" => { :gcc_40_build => 5493, :gcc_42_build => 5577 }, "3.2.6" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :llvm_build => 2335, :clang => "1.7", :clang_build => 77 },