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

Apply suggestions from code review

Browse Source 
Co-authored-by: Rylan Polster <rslpolster@gmail.com>
This commit is contained in:
Carlo Cabrera 2021-07-05 10:12:34 -07:00 committed by GitHub
parent 63aa192088
commit 5ed4430daf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/formula_cellar_checks.rb
View File

@ -307,10 +307,9 @@ module FormulaCellarChecks
end end
keg = Keg.new(formula.prefix) keg = Keg.new(formula.prefix)
has_cpuid_instruction = keg.binary_executable_or_library_files.any? do |file| return if keg.binary_executable_or_library_files.any? do |file|
cpuid_instruction?(file, objdump) cpuid_instruction?(file, objdump)
end end
return if has_cpuid_instruction
"No `cpuid` instruction detected. #{formula} should not use `ENV.runtime_cpu_detection`." "No `cpuid` instruction detected. #{formula} should not use `ENV.runtime_cpu_detection`."
end end
@ -355,8 +354,8 @@ module FormulaCellarChecks
has_cpuid_instruction = false has_cpuid_instruction = false
Utils.popen_read(objdump, "--disassemble", file) do |io| Utils.popen_read(objdump, "--disassemble", file) do |io|
until io.eof? until io.eof?
instruction = io.readline.split("\t")[@instruction_column_index[objdump]]&.chomp instruction = io.readline.split("\t")[@instruction_column_index[objdump]]&.strip
has_cpuid_instruction = instruction.match?(/^cpuid(\s+|$)/) if instruction has_cpuid_instruction = instruction == "cpuid" if instruction.present?
break if has_cpuid_instruction break if has_cpuid_instruction
end end
end end