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

bhearsum · bhearsum · commit 7a641114f376 · 2020-11-16T18:13:15.000Z
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
diff --git a/python/mozbuild/mozbuild/repackaging/mar.py b/python/mozbuild/mozbuild/repackaging/mar.py
@@ -23,6 +23,8 @@
     "x86": ["--x86"],
     "x86_64": ["--x86"],
     "aarch64": [],
+    # macOS Universal Builds
+    "macos-x86_64-aarch64": [],
 }
 
 
diff --git a/taskcluster/taskgraph/util/platforms.py b/taskcluster/taskgraph/util/platforms.py
@@ -29,7 +29,7 @@
 _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",

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`"x86": ["--x86"],`
`24`	`24`	`"x86_64": ["--x86"],`
`25`	`25`	`"aarch64": [],`
	`26`	`+ # macOS Universal Builds`
	`27`	`+ "macos-x86_64-aarch64": [],`
`26`	`28`	`}`
`27`	`29`
`28`	`30`