diff options
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/hardware.rb | 10 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/hardware.rb | 14 |
2 files changed, 15 insertions, 9 deletions
diff --git a/Library/Homebrew/hardware.rb b/Library/Homebrew/hardware.rb index 0a52d10db..a47de5247 100644 --- a/Library/Homebrew/hardware.rb +++ b/Library/Homebrew/hardware.rb @@ -30,6 +30,14 @@ class Hardware def is_64_bit? bits == 64 end + + def intel? + type == :intel + end + + def ppc? + type == :ppc + end end if OS.mac? @@ -53,7 +61,7 @@ class Hardware end def self.oldest_cpu - if Hardware::CPU.type == :intel + if Hardware::CPU.intel? if Hardware::CPU.is_64_bit? :core2 else diff --git a/Library/Homebrew/os/mac/hardware.rb b/Library/Homebrew/os/mac/hardware.rb index 53a9a6463..888a99b1b 100644 --- a/Library/Homebrew/os/mac/hardware.rb +++ b/Library/Homebrew/os/mac/hardware.rb @@ -27,9 +27,8 @@ module MacCPUs end def family - if type == :intel - @intel_family ||= `/usr/sbin/sysctl -n hw.cpufamily`.to_i - case @intel_family + if intel? + case @intel_family ||= `/usr/sbin/sysctl -n hw.cpufamily`.to_i when 0x73d67300 # Yonah: Core Solo/Duo :core when 0x426f69ef # Merom: Core 2 Duo @@ -49,9 +48,8 @@ module MacCPUs else :dunno end - elsif type == :ppc - @ppc_family ||= `/usr/sbin/sysctl -n hw.cpusubtype`.to_i - case @ppc_family + elsif ppc? + case @ppc_family ||= `/usr/sbin/sysctl -n hw.cpusubtype`.to_i when 9 :g3 # PowerPC 750 when 10 @@ -81,11 +79,11 @@ module MacCPUs end def arch_32_bit - type == :intel ? :i386 : :ppc + intel? ? :i386 : :ppc end def arch_64_bit - type == :intel ? :x86_64 : :ppc64 + intel? ? :x86_64 : :ppc64 end # Returns an array that's been extended with ArchitectureListExtension, |