diff options
| -rw-r--r-- | Library/Homebrew/brew.h.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/global.rb | 6 | ||||
| -rwxr-xr-x | bin/brew | 19 |
3 files changed, 16 insertions, 11 deletions
diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb index a7a5878d1..8917322c9 100644 --- a/Library/Homebrew/brew.h.rb +++ b/Library/Homebrew/brew.h.rb @@ -452,7 +452,7 @@ def brew_install ################################################################# warnings begin if MACOS_VERSION >= 10.6 - opoo "You should upgrade to Xcode 3.2.2" if llvm_build < RECOMMENDED_LLVM + opoo "You should upgrade to Xcode 3.2.3" if llvm_build < RECOMMENDED_LLVM else opoo "You should upgrade to Xcode 3.1.4" if (gcc_40_build < RECOMMENDED_GCC_40) or (gcc_42_build < RECOMMENDED_GCC_42) end diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index c88821548..d9b0d18bb 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -37,6 +37,6 @@ 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 = 2207 -RECOMMENDED_GCC_40 = 5493 -RECOMMENDED_GCC_42 = (MACOS_VERSION >= 10.6) ? 5659 : 5577 +RECOMMENDED_LLVM = 2326 +RECOMMENDED_GCC_40 = (MACOS_VERSION >= 10.6) ? 5494 : 5493 +RECOMMENDED_GCC_42 = (MACOS_VERSION >= 10.6) ? 5664 : 5577 @@ -40,15 +40,20 @@ end def dump_config require 'hardware' + sha = `cd #{HOMEBREW_REPOSITORY} && git rev-parse --verify HEAD 2> /dev/null`.chomp bits = Hardware.bits cores = Hardware.cores_as_words + 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_40 = gcc_40_build - sha = `cd #{HOMEBREW_REPOSITORY} && git rev-parse --verify HEAD 2> /dev/null`.chomp - kernel_arch = `uname -m`.chomp + gcc_42_recommendation = (!gcc_42.nil? && gcc_42 < RECOMMENDED_GCC_42) ? "(#{RECOMMENDED_GCC_42} or newer recommended)" : "" - system_ruby = Pathname.new("/usr/bin/ruby") + gcc_40 = gcc_40_build + gcc_40_recommendation = (!gcc_40.nil? && gcc_40 < RECOMMENDED_GCC_40) ? "(#{RECOMMENDED_GCC_40} or newer recommended)" : "" puts <<-EOS HOMEBREW_VERSION: #{HOMEBREW_VERSION} @@ -62,9 +67,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"} (#{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)" : "" } +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} MacPorts or Fink? #{macports_or_fink_installed?} X11 installed? #{x11_installed?} EOS |