From a892e52bfc441f267ee01511d7ee454de70a8350 Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Thu, 1 Aug 2013 20:24:18 -0700 Subject: [PATCH] Add Hardware::CPU.universal_archs --- Library/Homebrew/os/mac/hardware.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Library/Homebrew/os/mac/hardware.rb b/Library/Homebrew/os/mac/hardware.rb index 05cd3da5e6..b0ac998224 100644 --- a/Library/Homebrew/os/mac/hardware.rb +++ b/Library/Homebrew/os/mac/hardware.rb @@ -1,3 +1,5 @@ +require 'mach' + module MacCPUs OPTIMIZATION_FLAGS = { :penryn => '-march=core2 -msse4.1', @@ -83,6 +85,18 @@ module MacCPUs type == :intel ? :x86_64 : :ppc64 end + # Returns an array that's been extended with ArchitectureListExtension, + # which provides helpers like #as_arch_flags and #as_cmake_arch_flags. + def universal_archs + # Building 64-bit is a no-go on Tiger, and pretty hit or miss on Leopard. + # Don't even try unless Tigerbrew's experimental 64-bit Leopard support is enabled. + if MacOS.version <= :leopard and !MacOS.prefer_64_bit? + [arch_32_bit].extend ArchitectureListExtension + else + [arch_32_bit, arch_64_bit].extend ArchitectureListExtension + end + end + def altivec? @altivec ||= sysctl_bool('hw.optional.altivec') end