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

Merge pull request #12202 from carlocab/config-clang

Browse Source 
system_config: fix clang version output on Linux
This commit is contained in:
Dawid Dziurla 2021-10-08 08:19:33 +02:00 committed by GitHub
commit 5af25eef9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/extend/os/mac/system_config.rb
View File

@ -7,7 +7,7 @@ module SystemConfig
class << self
include SystemCommand::Mixin
undef describe_homebrew_ruby
undef describe_homebrew_ruby, describe_clang
def describe_homebrew_ruby
s = describe_homebrew_ruby_version
@ -19,6 +19,13 @@ module SystemConfig
end
end
def describe_clang
return "N/A" if clang.null?
clang_build_info = clang_build.null? ? "(parse error)" : clang_build
"#{clang} build #{clang_build_info}"
end
def xcode
@xcode ||= if MacOS::Xcode.installed?
xcode = MacOS::Xcode.version.to_s

7
Library/Homebrew/system_config.rb
View File

@ -76,8 +76,11 @@ module SystemConfig
def describe_clang
return "N/A" if clang.null?
clang_build_info = clang_build.null? ? "(parse error)" : clang_build
"#{clang} build #{clang_build_info}"
if clang_build.null?
clang.to_s
else
"#{clang} build #{clang_build}"
end
end
def describe_path(path)