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

Homebrew · Sep 19, 2022 · fcdc376 · fcdc376
1 parent a653be8
commit fcdc376
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Library/Homebrew/extend/os/linux/development_tools.rb b/Library/Homebrew/extend/os/linux/development_tools.rb
@@ -8,7 +8,10 @@ class << self
     sig { params(tool: String).returns(T.nilable(Pathname)) }
     def locate(tool)
       (@locate ||= {}).fetch(tool) do |key|
-        @locate[key] = if (path = HOMEBREW_PREFIX/"bin/#{tool}").executable?
+        @locate[key] = if (build_system_too_old? &&
+                            ((path = HOMEBREW_PREFIX/"opt/binutils/bin/#{tool}").executable? ||
+                             (path = HOMEBREW_PREFIX/"opt/glibc/bin/#{tool}").executable?)) ||
+                          (path = HOMEBREW_PREFIX/"bin/#{tool}").executable?
           path
         elsif File.executable?(path = "/usr/bin/#{tool}")
           Pathname.new path
@@ -30,7 +33,7 @@ def build_system_too_old?
 
     sig { returns(T::Boolean) }
     def system_gcc_too_old?
-      gcc_version("gcc") < OS::LINUX_GCC_CI_VERSION
+      gcc_version("/usr/bin/gcc") < OS::LINUX_GCC_CI_VERSION
     end
 
     sig { returns(T::Hash[String, T.nilable(String)]) }