diff options
| author | Misty De Meo | 2013-08-01 19:46:56 -0700 |
|---|---|---|
| committer | Misty De Meo | 2013-08-15 22:46:56 -0700 |
| commit | 7583729b2055bdea7c44541e3d1851f447090b5e (patch) | |
| tree | 3f67148a8e9a773718981cff1a49a15e85f679c7 /Library/Homebrew/macos.rb | |
| parent | f3c3a840fe7ea14680952d70cfeb057eb7dbbb2c (diff) | |
| download | homebrew-7583729b2055bdea7c44541e3d1851f447090b5e.tar.bz2 | |
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.
Diffstat (limited to 'Library/Homebrew/macos.rb')
| -rw-r--r-- | Library/Homebrew/macos.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb index 2e5c02f39..8e379ad2a 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 }, |