admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

DRY gcc_build and llvm_build

Browse Source
This commit is contained in:
Max Howell 2009-11-09 18:47:26 +00:00
parent 20d7ef3d45
commit b99324fbeb
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/brew.h.rb
View File

@ -428,3 +428,15 @@ private
end end
end end
end end
def gcc_build
`/usr/bin/gcc-4.2 -v 2>&1` =~ /build (\d{4,})/
$1.to_i
end
def llvm_build
if MACOS_VERSION >= 10.6
`/Developer/usr/bin/llvm-gcc-4.2 -v 2>&1` =~ /LLVM build (\d{4,})/
$1.to_i
end
end

16
bin/brew
View File

@ -42,16 +42,6 @@ end
def dump_config def dump_config
require 'hardware' require 'hardware'
`/usr/bin/gcc-4.2 -v 2>&1` =~ /build (\d{4,})/
gcc_build = $1.to_i
llvm_build = "None"
if MACOS_VERSION >= 10.6
`/Developer/usr/bin/llvm-gcc-4.2 -v 2>&1` =~ /LLVM build (\d{4,})/
llvm_build = $1.to_i
end
bits = Hardware.is_64_bit? ? 64 : 32 bits = Hardware.is_64_bit? ? 64 : 32
cores = Hardware.processor_count cores = Hardware.processor_count
@ -215,11 +205,9 @@ begin
################################################################# warnings ################################################################# warnings
if MACOS_VERSION >= 10.6 if MACOS_VERSION >= 10.6
`/Developer/usr/bin/llvm-gcc-4.2 -v 2>&1` =~ /LLVM build (\d{4,})/ opoo "You should upgrade to Xcode 3.2.1" if llvm_build < 2206
opoo "You should upgrade to Xcode 3.2.1" if $1.to_i < 2206
else else
`/usr/bin/gcc-4.2 -v 2>&1` =~ /build (\d{4,})/ opoo "You should upgrade to Xcode 3.1" if gcc_build < 5577
opoo "You should upgrade to Xcode 3.1" if $1.to_i < 5577
end end
if macports_or_fink_installed? if macports_or_fink_installed?