From b99324fbebe136aa7ef1be08d99381d7b3298010 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Mon, 9 Nov 2009 18:47:26 +0000 Subject: [PATCH] DRY gcc_build and llvm_build --- Library/Homebrew/brew.h.rb | 12 ++++++++++++ bin/brew | 16 ++-------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb index ed80ecc221..8b73ccbcca 100644 --- a/Library/Homebrew/brew.h.rb +++ b/Library/Homebrew/brew.h.rb @@ -428,3 +428,15 @@ private 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 diff --git a/bin/brew b/bin/brew index a876c7fc3a..646357021e 100755 --- a/bin/brew +++ b/bin/brew @@ -42,16 +42,6 @@ end def dump_config 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 cores = Hardware.processor_count @@ -215,11 +205,9 @@ begin ################################################################# warnings 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 $1.to_i < 2206 + opoo "You should upgrade to Xcode 3.2.1" if llvm_build < 2206 else - `/usr/bin/gcc-4.2 -v 2>&1` =~ /build (\d{4,})/ - opoo "You should upgrade to Xcode 3.1" if $1.to_i < 5577 + opoo "You should upgrade to Xcode 3.1" if gcc_build < 5577 end if macports_or_fink_installed?