Skip to content
Snippets Groups Projects
Commit 8b27b84b authored by Buck Evan's avatar Buck Evan Committed by Buck Evan (bukzor)
Browse files

fix clang build version on Ubuntu Artful

parent 3cd5ae86
No related branches found
No related tags found
No related merge requests found
......@@ -74,7 +74,7 @@ class DevelopmentTools
def clang_build_version
@clang_build_version ||= begin
if (path = locate("clang")) &&
build_version = `#{path} --version`[/clang-(\d{2,})/, 1]
build_version = `#{path} --version`[%r{clang(-| version [^ ]+ \(tags/RELEASE_)(\d{2,})}, 2]
Version.new build_version
else
Version::NULL
......
......@@ -210,7 +210,18 @@ class SystemConfig
f.puts "Homebrew Ruby: #{describe_homebrew_ruby}"
f.puts "GCC-4.0: build #{gcc_4_0}" unless gcc_4_0.null?
f.puts "GCC-4.2: build #{gcc_4_2}" unless gcc_4_2.null?
f.puts "Clang: #{clang.null? ? "N/A" : "#{clang} build #{clang_build}"}"
f.print "Clang: "
if clang.null?
f.print "N/A"
else
f.print "#{clang} build "
if clang_build.null?
f.print "(parse error)"
else
f.print clang_build
end
end
f.print "\n"
f.puts "Git: #{describe_git}"
f.puts "Curl: #{describe_curl}"
f.puts "Perl: #{describe_perl}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment