aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMax Howell2009-11-09 18:47:26 +0000
committerMax Howell2009-11-09 18:47:26 +0000
commitb99324fbebe136aa7ef1be08d99381d7b3298010 (patch)
tree541f5e22ed56fd26c31f33f1b34aa498a4ca36cb /bin
parent20d7ef3d45fa52035134b45ed48697e6aebca1fc (diff)
downloadbrew-b99324fbebe136aa7ef1be08d99381d7b3298010.tar.bz2
DRY gcc_build and llvm_build
Diffstat (limited to 'bin')
-rwxr-xr-xbin/brew16
1 files changed, 2 insertions, 14 deletions
diff --git a/bin/brew b/bin/brew
index a876c7fc3..646357021 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?