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

Skip GCC version check

Browse Source 
This is not necessary.

In addition,
1. Avoid an error when `formula.tap` is `nil`.
2. Use the more suggestive `gcc.dep.rpaths.migrated` as the setting
   name.
This commit is contained in:
Carlo Cabrera 2022-08-03 15:29:53 +08:00
parent 7be6b8e6d1
commit f0d2de1869
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/cmd/update-report.rb
View File

@ -294,18 +294,10 @@ module Homebrew
def migrate_gcc_dependents_if_needed def migrate_gcc_dependents_if_needed
return if OS.mac? return if OS.mac?
return if Settings.read("gcc.dep.rpaths.migrated") == "true"
# TODO: Remove this block when GCC 12 ships.
begin
return if Formula["gcc"].version < 12
rescue FormulaUnavailableError
return if Homebrew::EnvConfig.install_from_api?
end
return if Settings.read("gcc.dependents.migrated") == "true"
Formula.installed.each do |formula| Formula.installed.each do |formula|
next unless formula.tap.core_tap? next unless formula.tap&.core_tap?
next unless formula.recursive_dependencies.map(&:name).include? "gcc" next unless formula.recursive_dependencies.map(&:name).include? "gcc"
keg = formula.installed_kegs.last keg = formula.installed_kegs.last
@ -317,7 +309,7 @@ module Homebrew
nil nil
end end
Settings.write "gcc.dependents.migrated", true Settings.write "gcc.dep.rpaths.migrated", true
end end
end end