From e46a61e181f8e324d1bc4222bedf692c11ad84fa Mon Sep 17 00:00:00 2001 From: Lukas Oberhuber Date: Sat, 30 Jul 2022 11:08:52 +0100 Subject: [PATCH] rename & inline dsymutil to prepare_debug_symbols --- Library/Homebrew/extend/os/mac/keg.rb | 2 +- Library/Homebrew/formula_installer.rb | 10 +--------- Library/Homebrew/keg.rb | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/keg.rb b/Library/Homebrew/extend/os/mac/keg.rb index a1fde91b14..7337586456 100644 --- a/Library/Homebrew/extend/os/mac/keg.rb +++ b/Library/Homebrew/extend/os/mac/keg.rb @@ -63,7 +63,7 @@ class Keg EOS end - def dsymutil + def prepare_debug_symbols binary_executable_or_library_files.each do |file| odebug "Extracting symbols #{file}" diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 18c8e94334..e895c09215 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -807,7 +807,7 @@ class FormulaInstaller post_install end - dsymutil(keg) if debug_symbols? + keg.prepare_debug_symbols if debug_symbols? # Updates the cache for a particular formula after doing an install CacheStoreDatabase.use(:linkage) do |db| @@ -1338,12 +1338,4 @@ class FormulaInstaller #{SPDX.license_expression_to_string formula.license}. EOS end - - sig { params(keg: Keg).void } - def dsymutil(keg) - keg.dsymutil - rescue RuntimeError => e - ofail "Failed to extract debugging symbols for #{formula.full_name}" - puts e - end end diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index f28c6da545..a12e8de395 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -483,7 +483,7 @@ class Keg ObserverPathnameExtension.n end - def dsymutil; end + def prepare_debug_symbols; end def remove_oldname_opt_record return unless oldname_opt_record