Skip to content

Commit

Permalink
refactor compiler messages
Browse files Browse the repository at this point in the history
  • Loading branch information
adamv committed Sep 30, 2010
1 parent 6379757 commit fdb5b41
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
5 changes: 5 additions & 0 deletions Library/Homebrew/brew.h.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 6 additions & 11 deletions bin/brew
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
Expand Down

0 comments on commit fdb5b41

Please sign in to comment.