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

Make MacOS.clang_build_version more useful

Browse Source 
Let's choose the first \d{2,} as the build number, as it is the most
likely to indicate significant changes, and we need something to use for
comparison when selecting compilers.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-01-11 02:02:32 -06:00
parent 7423b79f3a
commit d106cfed06
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/--config.rb
View File

@ -54,7 +54,7 @@ module Homebrew extend self
GCC-4.0: #{gcc_40 ? "build #{gcc_40}" : "N/A"} GCC-4.0: #{gcc_40 ? "build #{gcc_40}" : "N/A"}
GCC-4.2: #{gcc_42 ? "build #{gcc_42}" : "N/A"} GCC-4.2: #{gcc_42 ? "build #{gcc_42}" : "N/A"}
LLVM: #{llvm ? "build #{llvm}" : "N/A"} LLVM: #{llvm ? "build #{llvm}" : "N/A"}
Clang: #{clang ? "#{clang}-#{clang_build}" : "N/A"} Clang: #{clang ? "#{clang} build #{clang_build}" : "N/A"}
MacPorts or Fink? #{macports_or_fink_installed?} MacPorts or Fink? #{macports_or_fink_installed?}
X11 installed? #{x11_installed?} X11 installed? #{x11_installed?}
EOS EOS

4
Library/Homebrew/utils.rb
View File

@ -343,8 +343,8 @@ module MacOS extend self
def clang_build_version def clang_build_version
@clang_build_version ||= if File.exist? "/usr/bin/clang" @clang_build_version ||= if File.exist? "/usr/bin/clang"
`/usr/bin/clang --version` =~ %r[tags/Apple/clang-(\d+(\.\d+)*)] `/usr/bin/clang --version` =~ %r[tags/Apple/clang-(\d{2,})]
$1 $1.to_i
end end
end end