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

Merge pull request #13889 from Bo98/config-linux

Browse Source 
extend/os/linux/system_config: support gcc 12 & keg-only glibc
This commit is contained in:
Bo Anderson 2022-09-19 08:10:28 +01:00 committed by GitHub
commit 50298ec77e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ module SystemConfig
def formula_linked_version(formula) def formula_linked_version(formula)
return "N/A" unless CoreTap.instance.installed? return "N/A" unless CoreTap.instance.installed?
Formulary.factory(formula).linked_version || "N/A" Formulary.factory(formula).any_installed_version || "N/A"
rescue FormulaUnavailableError rescue FormulaUnavailableError
"N/A" "N/A"
end end
@ -47,7 +47,7 @@ module SystemConfig
out.puts "Host glibc: #{host_glibc_version}" out.puts "Host glibc: #{host_glibc_version}"
out.puts "/usr/bin/gcc: #{host_gcc_version}" out.puts "/usr/bin/gcc: #{host_gcc_version}"
out.puts "/usr/bin/ruby: #{host_ruby_version}" if RUBY_PATH != HOST_RUBY_PATH out.puts "/usr/bin/ruby: #{host_ruby_version}" if RUBY_PATH != HOST_RUBY_PATH
["glibc", CompilerSelector.preferred_gcc, "xorg"].each do |f| ["glibc", CompilerSelector.preferred_gcc, OS::LINUX_PREFERRED_GCC_RUNTIME_FORMULA, "xorg"].each do |f|
out.puts "#{f}: #{formula_linked_version(f)}" out.puts "#{f}: #{formula_linked_version(f)}"
end end
end end