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

extend/os/linux/development_tools: consider keg-only glibc & binutils

Browse Source
This commit is contained in:
Bo Anderson 2022-09-19 04:35:40 +01:00
parent ae3c6a6574
commit a372ca6100
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,15 @@ class DevelopmentTools
sig { params(tool: String).returns(T.nilable(Pathname)) } sig { params(tool: String).returns(T.nilable(Pathname)) }
def locate(tool) def locate(tool)
(@locate ||= {}).fetch(tool) do |key| (@locate ||= {}).fetch(tool) do |key|
@locate[key] = if (path = HOMEBREW_PREFIX/"bin/#{tool}").executable? @locate[key] = if build_system_too_old? &&
path (binutils_path = HOMEBREW_PREFIX/"opt/binutils/bin/#{tool}").executable?
elsif File.executable?(path = "/usr/bin/#{tool}") binutils_path
Pathname.new path elsif build_system_too_old? && (glibc_path = HOMEBREW_PREFIX/"opt/glibc/bin/#{tool}").executable?
glibc_path
elsif (homebrew_path = HOMEBREW_PREFIX/"bin/#{tool}").executable?
homebrew_path
elsif File.executable?(system_path = "/usr/bin/#{tool}")
Pathname.new system_path
end end
end end
end end
@ -30,7 +35,7 @@ class DevelopmentTools
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def system_gcc_too_old? def system_gcc_too_old?
gcc_version("gcc") < OS::LINUX_GCC_CI_VERSION gcc_version("/usr/bin/gcc") < OS::LINUX_GCC_CI_VERSION
end end
sig { returns(T::Hash[String, T.nilable(String)]) } sig { returns(T::Hash[String, T.nilable(String)]) }