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

fix clang build version on Ubuntu Artful

Browse Source 
Ported from https://github.com/Linuxbrew/brew/pull/621
This commit is contained in:
Buck Evan 2018-03-17 18:03:19 -07:00 committed by Buck Evan (bukzor)
parent 3cd5ae860f
commit 8b27b84b4b
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/development_tools.rb
View File

@ -74,7 +74,7 @@ class DevelopmentTools
def clang_build_version def clang_build_version
@clang_build_version ||= begin @clang_build_version ||= begin
if (path = locate("clang")) && 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 Version.new build_version
else else
Version::NULL Version::NULL

13
Library/Homebrew/system_config.rb
View File

@ -210,7 +210,18 @@ class SystemConfig
f.puts "Homebrew Ruby: #{describe_homebrew_ruby}" 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.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 "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 "Git: #{describe_git}"
f.puts "Curl: #{describe_curl}" f.puts "Curl: #{describe_curl}"
f.puts "Perl: #{describe_perl}" f.puts "Perl: #{describe_perl}"