Skip to content

Commit

Permalink
Merge pull request #18456 from Homebrew/skip-incompatible-arch
Browse files Browse the repository at this point in the history
  • Loading branch information
carlocab authored Sep 30, 2024
2 parents cdc228a + 6329db9 commit f0513c0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Library/Homebrew/extend/pathname.rb
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,11 @@ def dylib?
false
end

sig { params(_wanted_arch: Symbol).returns(T::Boolean) }
def arch_compatible?(_wanted_arch)
true
end

sig { returns(T::Array[String]) }
def rpaths
[]
Expand Down
1 change: 1 addition & 0 deletions Library/Homebrew/linkage_checker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ def check_dylibs(rebuild_cache:)
@keg.find do |file|
next if file.symlink? || file.directory?
next if !file.dylib? && !file.binary_executable? && !file.mach_o_bundle?
next unless file.arch_compatible?(Hardware::CPU.arch)

# weakly loaded dylibs may not actually exist on disk, so skip them
# when checking for broken linkage
Expand Down
6 changes: 6 additions & 0 deletions Library/Homebrew/os/linux/elf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ def arch
end
end

def arch_compatible?(wanted_arch)
return true unless elf?

wanted_arch == arch
end

def elf_type
return :dunno unless elf?

Expand Down

0 comments on commit f0513c0

Please sign in to comment.