9 files changed, 102 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"
diff --git a/comm/mail/config/mozconfigs/macosx64/common-opt b/comm/mail/config/mozconfigs/macosx64/common-opt
new file mode 100644
index 0000000000..2983e69a64
--- /dev/null
+++ b/comm/mail/config/mozconfigs/macosx64/common-opt
@@ -0,0 +1,9 @@
+# This file is sourced by the nightly, and release mozconfigs.
+
+. $topsrcdir/build/macosx/mozconfig.common
+
+ # Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
diff --git a/comm/mail/config/mozconfigs/macosx64/debug b/comm/mail/config/mozconfigs/macosx64/debug
new file mode 100644
index 0000000000..3e1e712183
--- /dev/null
+++ b/comm/mail/config/mozconfigs/macosx64/debug
@@ -0,0 +1,12 @@
+. "$topsrcdir/comm/build/mozconfig.comm-sccache"
+. "$topsrcdir/build/macosx/mozconfig.common"
+
+ac_add_options --enable-debug
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Package js shell
+export MOZ_PACKAGE_JSSHELL=1
+
+. "$topsrcdir/comm/mail/config/mozconfigs/common"
diff --git a/comm/mail/config/mozconfigs/macosx64/debug-searchfox b/comm/mail/config/mozconfigs/macosx64/debug-searchfox
new file mode 100644
index 0000000000..dc24864212
--- /dev/null
+++ b/comm/mail/config/mozconfigs/macosx64/debug-searchfox
@@ -0,0 +1,13 @@
+MOZ_AUTOMATION_BUILD_SYMBOLS=0
+MOZ_AUTOMATION_CHECK=0
+
+. "$topsrcdir/build/macosx/mozconfig.common"
+. "$topsrcdir/comm/mail/config/mozconfigs/common"
+
+ac_add_options --enable-debug
+
+ac_add_options --enable-clang-plugin
+ac_add_options --enable-mozsearch-plugin
+
+# Disable enforcing that add-ons are signed by the trusted root
+MOZ_REQUIRE_ADDON_SIGNING=0
diff --git a/comm/mail/config/mozconfigs/macosx64/l10n-mozconfig b/comm/mail/config/mozconfigs/macosx64/l10n-mozconfig
new file mode 100644
index 0000000000..d4fe5a2b15
--- /dev/null
+++ b/comm/mail/config/mozconfigs/macosx64/l10n-mozconfig
@@ -0,0 +1,9 @@
+. "$topsrcdir/comm/mail/config/mozconfigs/l10n-common"
+
+if test `uname -s` = "Linux"; then
+  # We need to indicate the target for cross builds
+  ac_add_options --target=x86_64-apple-darwin
+  export MKFSHFS=$MOZ_FETCHES_DIR/hfsplus/newfs_hfs
+  export DMG_TOOL=$MOZ_FETCHES_DIR/dmg/dmg
+  export HFS_TOOL=$MOZ_FETCHES_DIR/dmg/hfsplus
+fi
diff --git a/comm/mail/config/mozconfigs/macosx64/nightly b/comm/mail/config/mozconfigs/macosx64/nightly
new file mode 100644
index 0000000000..9923e20766
--- /dev/null
+++ b/comm/mail/config/mozconfigs/macosx64/nightly
@@ -0,0 +1,12 @@
+. "$topsrcdir/comm/build/mozconfig.comm-sccache"
+. "$topsrcdir/comm/mail/config/mozconfigs/macosx64/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/release b/comm/mail/config/mozconfigs/macosx64/release
new file mode 100644
index 0000000000..d4c59231ff
--- /dev/null
+++ b/comm/mail/config/mozconfigs/macosx64/release
@@ -0,0 +1,7 @@
+. "$topsrcdir/comm/build/mozconfig.comm-sccache"
+. "$topsrcdir/comm/mail/config/mozconfigs/macosx64/common-opt"
+
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
+ac_add_options --enable-official-branding
+
+. "$topsrcdir/comm/mail/config/mozconfigs/common"