Bug 1678775 - Update macosx mozconfigs with a common-opt include file. r=justdave
authorRob Lemley <rob@thunderbird.net>
Fri, 20 Nov 2020 21:15:18 -0500
changeset 31544 e3db271af053d2373476b48098618d47e282cbd1
parent 31543 0f4f1c5ca5d305dd600f759c69737e43478e6777
child 31545 67135370270ceab4dab39d16d7115279b76a1e71
push id18402
push userthunderbird@calypsoblue.org
push dateThu, 28 Jan 2021 22:03:06 +0000
treeherdercomm-central@f3d6b7ba3951 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjustdave
bugs1678775
Bug 1678775 - Update macosx mozconfigs with a common-opt include file. r=justdave This keeps macOS configs in line with Firefox. Differential Revision: https://phabricator.services.mozilla.com/D99188
mail/config/mozconfigs/macosx64/common-opt
mail/config/mozconfigs/macosx64/nightly
mail/config/mozconfigs/macosx64/release
new file mode 100644
--- /dev/null
+++ b/mail/config/mozconfigs/macosx64/common-opt
@@ -0,0 +1,14 @@
+# 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
+
+# For NSS symbols
+export MOZ_DEBUG_SYMBOLS=1
+
+export MOZ_TELEMETRY_REPORTING=1
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
--- a/mail/config/mozconfigs/macosx64/nightly
+++ b/mail/config/mozconfigs/macosx64/nightly
@@ -1,19 +1,12 @@
 . "$topsrcdir/comm/build/mozconfig.comm-sccache"
-. "$topsrcdir/build/macosx/mozconfig.common"
+. "$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
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell
-export MOZ_PACKAGE_JSSHELL=1
-
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
--- a/mail/config/mozconfigs/macosx64/release
+++ b/mail/config/mozconfigs/macosx64/release
@@ -1,18 +1,7 @@
-. "$topsrcdir/build/macosx/mozconfig.common"
-
+. "$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
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell
-export MOZ_PACKAGE_JSSHELL=1
-
 . "$topsrcdir/comm/mail/config/mozconfigs/common"