From 76dcc1929b0e651ef4807695457a355d74c77840 Mon Sep 17 00:00:00 2001
From: Adam Vandenberg <flangy@gmail.com>
Date: Wed, 22 Sep 2010 13:37:11 -0700
Subject: [PATCH] refactor compiler messages

---
 Library/Homebrew/brew.h.rb |  5 +++++
 bin/brew                   | 17 ++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index a5047df56f..a35ca0b49d 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -579,3 +579,8 @@ def llvm_build
     $1.to_i
   end
 end
+
+def _compiler_recommendation build, recommended
+  message = (!build.nil? && build < recommended) ? "(#{recommended} or newer recommended)" : ""
+  return build, message
+end
diff --git a/bin/brew b/bin/brew
index 5ac9cbbaa9..1fac965bd1 100755
--- a/bin/brew
+++ b/bin/brew
@@ -46,14 +46,9 @@ def dump_config
   kernel_arch = `uname -m`.chomp
   system_ruby = Pathname.new("/usr/bin/ruby")
 
-  llvm = llvm_build
-  llvm_recommendation = (!llvm.nil? && llvm < RECOMMENDED_LLVM) ? "(#{RECOMMENDED_LLVM} or newer recommended)" : ""
-
-  gcc_42 = gcc_42_build
-  gcc_42_recommendation = (!gcc_42.nil? && gcc_42 < RECOMMENDED_GCC_42) ? "(#{RECOMMENDED_GCC_42} or newer recommended)" : ""
-
-  gcc_40 = gcc_40_build
-  gcc_40_recommendation = (!gcc_40.nil? && gcc_40 < RECOMMENDED_GCC_40) ? "(#{RECOMMENDED_GCC_40} or newer recommended)" : ""
+  llvm,   llvm_msg   = _compiler_recommendation llvm_build,   RECOMMENDED_LLVM
+  gcc_42, gcc_42_msg = _compiler_recommendation gcc_42_build, RECOMMENDED_GCC_42
+  gcc_40, gcc_40_msg = _compiler_recommendation gcc_40_build, RECOMMENDED_GCC_40
 
   puts <<-EOS
 HOMEBREW_VERSION: #{HOMEBREW_VERSION}
@@ -67,9 +62,9 @@ OS X: #{MACOS_FULL_VERSION}
 Kernel Architecture: #{kernel_arch}
 Ruby: #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}
 /usr/bin/ruby => #{system_ruby.realpath}
-GCC-4.0: #{gcc_40 ? "build #{gcc_40}" : "N/A"} #{gcc_42_recommendation}
-GCC-4.2: #{gcc_42 ? "build #{gcc_42}" : "N/A"} #{gcc_40_recommendation}
-LLVM: #{llvm ? "build #{llvm}" : "N/A" } #{llvm_recommendation}
+GCC-4.0: #{gcc_40 ? "build #{gcc_40}" : "N/A"} #{gcc_42_msg}
+GCC-4.2: #{gcc_42 ? "build #{gcc_42}" : "N/A"} #{gcc_40_msg}
+LLVM: #{llvm ? "build #{llvm}" : "N/A" } #{llvm_msg}
 MacPorts or Fink? #{macports_or_fink_installed?}
 X11 installed? #{x11_installed?}
 EOS