3 files changed, 40 insertions, 0 deletions
diff --git a/comm/mail/config/mozconfigs/macosx64-aarch64/common-opt b/comm/mail/config/mozconfigs/macosx64-aarch64/common-opt
new file mode 100644
index 0000000000..f1f39b7c53
--- /dev/null
+++ b/comm/mail/config/mozconfigs/macosx64-aarch64/common-opt
@@ -0,0 +1,21 @@
+# This file is sourced by the nightly and release mozconfigs.
+
+. $topsrcdir/build/macosx/mozconfig.common
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+ac_add_options --target=aarch64-apple-darwin
+
+# As of Clang 13, the default is -mcpu=apple-m1 when using a aarch64-apple-macos target,
+# but we're using apple64-apple-darwin, which defaults to -mcpu=apple-a7, which disables
+# a bunch of # performance-enabling CPU features.
+# TODO: We'll want to switch to aarch64-apple-macos eventually.
+export CFLAGS="$CFLAGS -mcpu=apple-m1"
+export CXXFLAGS="$CXXFLAGS -mcpu=apple-m1"
+
diff --git a/comm/mail/config/mozconfigs/macosx64-aarch64/nightly b/comm/mail/config/mozconfigs/macosx64-aarch64/nightly
new file mode 100644
index 0000000000..deaffb107e
--- /dev/null
+++ b/comm/mail/config/mozconfigs/macosx64-aarch64/nightly
@@ -0,0 +1,12 @@
+. "$topsrcdir/comm/build/mozconfig.comm-sccache"
+. "$topsrcdir/comm/mail/config/mozconfigs/macosx64-aarch64/common-opt"
+
+# Cross-compiled builds fail when dtrace is enabled
+if test `uname -s` != Linux; then
+  ac_add_options --enable-dtrace
+fi
+
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
+ac_add_options --enable-profiling
+
+. "$topsrcdir/comm/mail/config/mozconfigs/common"
diff --git a/comm/mail/config/mozconfigs/macosx64-aarch64/release b/comm/mail/config/mozconfigs/macosx64-aarch64/release
new file mode 100644
index 0000000000..934b4afd01
--- /dev/null
+++ b/comm/mail/config/mozconfigs/macosx64-aarch64/release
@@ -0,0 +1,7 @@
+. "$topsrcdir/comm/build/mozconfig.comm-sccache"
+. "$topsrcdir/comm/mail/config/mozconfigs/macosx64-aarch64/common-opt"
+
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
+ac_add_options --enable-official-branding
+
+. "$topsrcdir/comm/mail/config/mozconfigs/common"