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

Fix universal binary handling in check_flat_namespace

Browse Source
This commit is contained in:
Carlo Cabrera 2021-10-12 13:49:53 +08:00
parent 0484bfe820
commit 7223f8ef74
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/extend/os/mac/formula_cellar_checks.rb
View File

@ -95,12 +95,13 @@ module FormulaCellarChecks
keg = Keg.new(formula.prefix) keg = Keg.new(formula.prefix)
flat_namespace_files = keg.mach_o_files.reject do |file| flat_namespace_files = keg.mach_o_files.reject do |file|
next true unless file.dylib? next true unless file.dylib?
# FIXME: macho.header.flag? is not defined when macho
# is a universal binary.
next true if file.universal?
macho = MachO.open(file) macho = MachO.open(file)
macho.header.flag?(:MH_TWO_LEVEL) if file.universal?
macho.machos.map(&:header).all? { |h| h.flag? :MH_TWO_LEVEL }
else
macho.header.flag?(:MH_TWO_LEVEL)
end
end end
return if flat_namespace_files.empty? return if flat_namespace_files.empty?