admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

refactor compiler messages

Browse Source
This commit is contained in:
Adam Vandenberg 2010-09-22 13:37:11 -07:00
parent 400aa9eac9
commit 76dcc1929b
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/brew.h.rb
View File

@ -579,3 +579,8 @@ def llvm_build
$1.to_i $1.to_i
end end
end end
def _compiler_recommendation build, recommended
message = (!build.nil? && build < recommended) ? "(#{recommended} or newer recommended)" : ""
return build, message
end

17
bin/brew
View File

@ -46,14 +46,9 @@ def dump_config
kernel_arch = `uname -m`.chomp kernel_arch = `uname -m`.chomp
system_ruby = Pathname.new("/usr/bin/ruby") system_ruby = Pathname.new("/usr/bin/ruby")
llvm = llvm_build llvm, llvm_msg = _compiler_recommendation llvm_build, RECOMMENDED_LLVM
llvm_recommendation = (!llvm.nil? && llvm < RECOMMENDED_LLVM) ? "(#{RECOMMENDED_LLVM} or newer recommended)" : "" 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
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)" : ""
puts <<-EOS puts <<-EOS
HOMEBREW_VERSION: #{HOMEBREW_VERSION} HOMEBREW_VERSION: #{HOMEBREW_VERSION}
@ -67,9 +62,9 @@ OS X: #{MACOS_FULL_VERSION}
Kernel Architecture: #{kernel_arch} Kernel Architecture: #{kernel_arch}
Ruby: #{RUBY_VERSION}-#{RUBY_PATCHLEVEL} Ruby: #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}
/usr/bin/ruby => #{system_ruby.realpath} /usr/bin/ruby => #{system_ruby.realpath}
GCC-4.0: #{gcc_40 ? "build #{gcc_40}" : "N/A"} #{gcc_42_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_recommendation} GCC-4.2: #{gcc_42 ? "build #{gcc_42}" : "N/A"} #{gcc_40_msg}
LLVM: #{llvm ? "build #{llvm}" : "N/A" } #{llvm_recommendation} LLVM: #{llvm ? "build #{llvm}" : "N/A" } #{llvm_msg}
MacPorts or Fink? #{macports_or_fink_installed?} MacPorts or Fink? #{macports_or_fink_installed?}
X11 installed? #{x11_installed?} X11 installed? #{x11_installed?}
EOS EOS