diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb index 2eb6f8e2e1..5609551940 100644 --- a/Library/Homebrew/brew.h.rb +++ b/Library/Homebrew/brew.h.rb @@ -579,6 +579,11 @@ def llvm_build end end +def xcode_version + `xcodebuild -version 2>&1` =~ /Xcode (\d(\.\d)*)/ + return $1 ? $1 : nil +end + def _compiler_recommendation build, recommended message = (!build.nil? && build < recommended) ? "(#{recommended} or newer recommended)" : "" return build, message diff --git a/bin/brew b/bin/brew index 000d074d4e..2fe06f3c6d 100755 --- a/bin/brew +++ b/bin/brew @@ -49,6 +49,7 @@ def dump_config 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 + xcode = xcode_version || "?" puts <<-EOS HOMEBREW_VERSION: #{HOMEBREW_VERSION} @@ -62,6 +63,7 @@ OS X: #{MACOS_FULL_VERSION} Kernel Architecture: #{kernel_arch} Ruby: #{RUBY_VERSION}-#{RUBY_PATCHLEVEL} /usr/bin/ruby => #{system_ruby.realpath} +Xcode: #{xcode} 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}