--- a/mail/config/mozconfigs/macosx64/debug
+++ b/mail/config/mozconfigs/macosx64/debug
@@ -1,13 +1,14 @@
-. $topsrcdir/build/macosx/mozconfig.common
+. "$topsrcdir/build/mozconfig.comm-support"
+. "$topsrcdir/build/macosx/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
+. "$commtopsrcdir/mail/config/mozconfigs/common"
 
-ac_add_options --enable-application=mail
 ac_add_options --enable-debug
-ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Disable checking that add-ons are signed by the trusted root
@@ -15,14 +16,12 @@ MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 . "$topsrcdir/build/mozconfig.cache"
 
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
-# XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
-ac_add_options RUSTFLAGS='-C debuginfo=1'
+if [ "$MOZ_IS_COMM_TOPDIR" == "1" ]; then
+  # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
+  ac_add_options RUSTFLAGS='-C debuginfo=1'
+fi

--- a/mail/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/mail/config/mozconfigs/macosx64/l10n-mozconfig
@@ -1,18 +1,15 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+. "$topsrcdir/build/mozconfig.comm-support"
+. "$topsrcdir/build/macosx/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
+. "$commtopsrcdir/mail/config/mozconfigs/common"
+
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 ac_add_options --with-l10n-base=../../l10n
-. $topsrcdir/build/mozconfig.no-compile
-
-# Build lightning locales
-ac_add_options --enable-calendar
+. "$topsrcdir/build/mozconfig.no-compile"
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1

--- a/mail/config/mozconfigs/macosx64/nightly
+++ b/mail/config/mozconfigs/macosx64/nightly
@@ -1,15 +1,16 @@
-. $topsrcdir/build/macosx/mozconfig.common
+. "$topsrcdir/build/mozconfig.comm-support"
+. "$topsrcdir/build/macosx/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
+. "$commtopsrcdir/mail/config/mozconfigs/common"
 
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
-ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
@@ -19,14 +20,12 @@ export MOZ_PACKAGE_JSSHELL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 . "$topsrcdir/build/mozconfig.cache"
 
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
-# XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
-ac_add_options RUSTFLAGS='-C debuginfo=1'
+if [ "$MOZ_IS_COMM_TOPDIR" == "1" ]; then
+  # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
+  ac_add_options RUSTFLAGS='-C debuginfo=1'
+fi

--- a/mail/config/mozconfigs/macosx64/release
+++ b/mail/config/mozconfigs/macosx64/release
@@ -1,14 +1,15 @@
-. $topsrcdir/build/macosx/mozconfig.common
+. "$topsrcdir/build/mozconfig.comm-support"
+. "$topsrcdir/build/macosx/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
+. "$commtopsrcdir/mail/config/mozconfigs/common"
 
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
@@ -16,14 +17,12 @@ export MOZ_TELEMETRY_REPORTING=1
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
-# XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
-ac_add_options RUSTFLAGS='-C debuginfo=1'
+if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
+  # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
+  ac_add_options RUSTFLAGS='-C debuginfo=1'
+fi