From 6bd6b81fd37b6ad3ee39a2b85b268c72e8009801 Mon Sep 17 00:00:00 2001 From: Csoregi Natalia Date: Fri, 12 Aug 2022 00:30:38 +0300 Subject: [PATCH] Backed out changeset acc954823b17 (bug 1783899) for causing toolchains bustage. CLOSED TREE --- taskcluster/ci/fetch/toolchains.yml | 2 +- toolkit/crashreporter/tools/symbolstore.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml index 531d0feb6cf9..df2d9351e260 100644 --- a/taskcluster/ci/fetch/toolchains.yml +++ b/taskcluster/ci/fetch/toolchains.yml @@ -406,7 +406,7 @@ dump-syms: fetch: type: git repo: https://github.com/mozilla/dump_syms/ - revision: ca37dd69b43095f11bb7873cd8569582a93c7925 + revision: 29c131802494c52e9e89597f1d763f79e797b348 rust-minidump: description: rust-minidump 0.14.0 source code (for minidump-stackwalk) diff --git a/toolkit/crashreporter/tools/symbolstore.py b/toolkit/crashreporter/tools/symbolstore.py index c6f2a60670a9..c09ef8fddde8 100755 --- a/toolkit/crashreporter/tools/symbolstore.py +++ b/toolkit/crashreporter/tools/symbolstore.py @@ -911,7 +911,11 @@ class Dumper_Mac(Dumper): # in order to dump all the symbols. if dsymbundle: # This is the .dSYM bundle. - return [self.dump_syms] + arch.split() + ["-j", "2", dsymbundle, file] + return ( + [self.dump_syms] + + arch.split() + + ["--type", "macho", "-j", "2", dsymbundle, file] + ) return Dumper.dump_syms_cmdline(self, file, arch) def GenerateDSYM(self, file):