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

Merge pull request #3943 from bukzor/clang-build-version

Browse Source 
fix clang build version on Ubuntu Artful
This commit is contained in:
Mike McQuaid 2018-03-22 08:38:46 +00:00 committed by GitHub
commit 8307347987
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 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

12
Library/Homebrew/system_config.rb
View File

@ -210,7 +210,17 @@ 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.puts "N/A"
else
f.print "#{clang} build "
if clang_build.null?
f.puts "(parse error)"
else
f.puts clang_build
end
end
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}"