From f0d2de1869f11eb692c38360912340fb6f2a3255 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 3 Aug 2022 15:29:53 +0800 Subject: [PATCH] Skip GCC version check 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. --- Library/Homebrew/cmd/update-report.rb | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index b8aa5169f2..660b7cf9f2 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -294,18 +294,10 @@ module Homebrew def migrate_gcc_dependents_if_needed return if OS.mac? - - # 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" + return if Settings.read("gcc.dep.rpaths.migrated") == "true" 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" keg = formula.installed_kegs.last @@ -317,7 +309,7 @@ module Homebrew nil end - Settings.write "gcc.dependents.migrated", true + Settings.write "gcc.dep.rpaths.migrated", true end end