Move recommended compiler versions into constants.

2 files changed, 10 insertions, 5 deletions

diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index 4e8ae2810..c1c4df807 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -38,6 +38,11 @@ MACOS_VERSION = /(10\.\d+)(\.\d+)?/.match(MACOS_FULL_VERSION).captures.first.to_
 HOMEBREW_USER_AGENT = "Homebrew #{HOMEBREW_VERSION} (Ruby #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}; Mac OS X #{MACOS_FULL_VERSION})"
 
 
+RECOMMENDED_LLVM = 2206
+RECOMMENDED_GCC_40 = 5493
+RECOMMENDED_GCC_42 = (MACOS_VERSION >= 10.6) ? 5646 : 5577
+
+
 class ExecutionError <RuntimeError
   attr :exit_status
 
diff --git a/bin/brew b/bin/brew
index cad3de721..3e886d9e7 100755
--- a/bin/brew
+++ b/bin/brew
@@ -60,9 +60,9 @@ Hardware: #{cores}-core #{bits}-bit #{Hardware.intel_family}
 OS X: #{MACOS_FULL_VERSION}
 Kernel Architecture: #{kernel_arch}
 Ruby: #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}
-GCC-4.0: #{gcc_40 ? "build #{gcc_40}" : "N/A"} (5493 or newer recommended)
-GCC-4.2: #{gcc_42 ? "build #{gcc_42}" : "N/A"} (5577 or newer recommended)
-LLVM: #{llvm ? "build #{llvm}" : "N/A" } #{llvm ? "(2206 or newer recommended)" : "" }
+GCC-4.0: #{gcc_40 ? "build #{gcc_40}" : "N/A"} (#{RECOMMENDED_GCC_40} or newer recommended)
+GCC-4.2: #{gcc_42 ? "build #{gcc_42}" : "N/A"} (#{RECOMMENDED_GCC_42} or newer recommended)
+LLVM: #{llvm ? "build #{llvm}" : "N/A" } #{llvm ? "(#{RECOMMENDED_LLVM} or newer recommended)" : "" }
 MacPorts or Fink? #{macports_or_fink_installed?}
 X11 installed? #{x11_installed?}
 EOS
@@ -256,9 +256,9 @@ begin
     ################################################################# warnings
     begin
       if MACOS_VERSION >= 10.6
-        opoo "You should upgrade to Xcode 3.2.1" if llvm_build < 2206
+        opoo "You should upgrade to Xcode 3.2.1" if llvm_build < RECOMMENDED_LLVM
       else
-        opoo "You should upgrade to Xcode 3.1.4" if (gcc_40_build < 5493) or (gcc_42_build < 5577)
+        opoo "You should upgrade to Xcode 3.1.4" if (gcc_40_build < RECOMMENDED_GCC_40) or (gcc_42_build < RECOMMENDED_GCC_42)
       end
     rescue
       # the reason we don't abort is some formula don't require Xcode