mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

extend/os/linux/install: use arch-agnostic ld.so path

Browse Source
This commit is contained in:
Bo Anderson 2022-09-19 03:34:55 +01:00
parent 88ca45002d
commit ae3c6a6574
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
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/install.rb
View File

@ -65,7 +65,7 @@ module Homebrew
def symlink_ld_so def symlink_ld_so
brew_ld_so = HOMEBREW_PREFIX/"lib/ld.so" brew_ld_so = HOMEBREW_PREFIX/"lib/ld.so"
ld_so = HOMEBREW_PREFIX/"opt/glibc/lib/ld-linux-x86-64.so.2" ld_so = HOMEBREW_PREFIX/"opt/glibc/bin/ld.so"
unless ld_so.readable? unless ld_so.readable?
ld_so = DYNAMIC_LINKERS.find { |s| File.executable? s } ld_so = DYNAMIC_LINKERS.find { |s| File.executable? s }
if ld_so.blank? if ld_so.blank?
@ -84,7 +84,7 @@ module Homebrew
def setup_preferred_gcc_libs def setup_preferred_gcc_libs
gcc_opt_prefix = HOMEBREW_PREFIX/"opt/#{OS::LINUX_PREFERRED_GCC_RUNTIME_FORMULA}" gcc_opt_prefix = HOMEBREW_PREFIX/"opt/#{OS::LINUX_PREFERRED_GCC_RUNTIME_FORMULA}"
glibc_installed = (HOMEBREW_PREFIX/"opt/glibc/lib/ld-linux-x86-64.so.2").readable? glibc_installed = (HOMEBREW_PREFIX/"opt/glibc/bin/ld.so").readable?
return unless gcc_opt_prefix.readable? return unless gcc_opt_prefix.readable?