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

Merge pull request #10980 from sjackman/build-info-glibc

Browse Source 
build_info: Add glibc_version for Linux
This commit is contained in:
Shaun Jackman 2021-04-02 11:18:26 -07:00 committed by GitHub
commit c33e187a2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/os/linux/development_tools.rb
View File

@ -19,5 +19,9 @@ class DevelopmentTools
def default_compiler def default_compiler
:gcc :gcc
end end
def build_system_info
generic_build_system_info.merge "glibc_version" => OS::Linux::Glibc.version
end
end end
end end

21
Library/Homebrew/os/linux/glibc.rb
View File

@ -12,12 +12,25 @@ module OS
module_function module_function
def system_version def system_version
return @system_version if @system_version @system_version ||= begin
version = Utils.popen_read("/usr/bin/ldd", "--version")[/ (\d+\.\d+)/, 1] version = Utils.popen_read("/usr/bin/ldd", "--version")[/ (\d+\.\d+)/, 1]
return Version::NULL unless version if version
Version.new version
else
Version::NULL
end
end
end
@system_version = Version.new version def version
@version ||= begin
version = Utils.popen_read(HOMEBREW_PREFIX/"opt/glibc/bin/ldd", "--version")[/ (\d+\.\d+)/, 1]
if version
Version.new version
else
system_version
end
end
end end
sig { returns(Version) } sig { returns(Version) }