--- a/mail/config/mozconfigs/macosx64/debug
+++ b/mail/config/mozconfigs/macosx64/debug
@@ -19,14 +19,9 @@ MOZ_REQUIRE_ADDON_SIGNING=0
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-ccache
 
 # 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'
-
-# Disable stylo.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1380171
-ac_add_options --disable-stylo
+. $topsrcdir/mail/config/mozconfigs/macosx64/no-stylo

--- a/mail/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/mail/config/mozconfigs/macosx64/l10n-mozconfig
@@ -13,14 +13,9 @@ ac_add_options --enable-calendar
 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
 
-# XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
-ac_add_options RUSTFLAGS='-C debuginfo=1'
-
-# Disable stylo.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1380171
-ac_add_options --disable-stylo
+. $topsrcdir/mail/config/mozconfigs/macosx64/no-stylo

--- a/mail/config/mozconfigs/macosx64/nightly
+++ b/mail/config/mozconfigs/macosx64/nightly
@@ -32,14 +32,9 @@ MOZ_ADDON_SIGNING=0
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 ac_add_options --with-ccache
 
 # 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'
-
-# Disable stylo.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1380171
-ac_add_options --disable-stylo
+. $topsrcdir/mail/config/mozconfigs/macosx64/no-stylo

new file mode 100644
--- /dev/null
+++ b/mail/config/mozconfigs/macosx64/no-stylo
@@ -0,0 +1,8 @@
+# XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
+ac_add_options RUSTFLAGS='-C debuginfo=1'
+
+# Disable stylo.
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1380171
+ac_add_options --disable-stylo
+
+unset LLVM_CONFIG

--- a/mail/config/mozconfigs/macosx64/release
+++ b/mail/config/mozconfigs/macosx64/release
@@ -29,14 +29,9 @@ 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'
-
-# Disable stylo.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1380171
-ac_add_options --disable-stylo
+. $topsrcdir/mail/config/mozconfigs/macosx64/no-stylo