Bug 1677550: Native ARM64 Mac Nightly Fails to Update. r=aki a=Aryx

This patch adjusts the BCJ options for macOS builds to avoid using
optimizations that only work on x86/x86_64.

Differential Revision: https://phabricator.services.mozilla.com/D97196

python/mozbuild/mozbuild/repackaging/mar.py

@@ -23,6 +23,8 @@ _BCJ_OPTIONS = {
     "x86": ["--x86"],
     "x86_64": ["--x86"],
     "aarch64": [],
+    # macOS Universal Builds
+    "macos-x86_64-aarch64": [],
 }
 
 

taskcluster/taskgraph/util/platforms.py

@@ -29,7 +29,7 @@ _executable_extension = {
 _architectures = {
     r"linux\b.*": "x86",
     r"linux64\b.*": "x86_64",
-    r"macosx64\b.*": "x86_64",
+    r"macosx64\b.*": "macos-x86_64-aarch64",
     r"win32\b.*": "x86",
     r"win64\b(?!-aarch64).*": "x86_64",
     r"win64-aarch64\b.*": "aarch64",