--- a/mail/config/mozconfigs/macosx64/debug
+++ b/mail/config/mozconfigs/macosx64/debug
@@ -16,12 +16,18 @@ 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"
 
-if [ "$MOZ_IS_COMM_TOPDIR" == "1" ]; then
+
+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
+
+if [ "$MOZ_IS_COMM_TOPDIR" != "1" ]; then
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1419472
+  ac_add_options --disable-clang-plugin
+fi

--- a/mail/config/mozconfigs/macosx64/nightly
+++ b/mail/config/mozconfigs/macosx64/nightly
@@ -20,12 +20,17 @@ 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"
 
-if [ "$MOZ_IS_COMM_TOPDIR" == "1" ]; then
+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
+
+if [ "$MOZ_IS_COMM_TOPDIR" != "1" ]; then
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1419472
+  ac_add_options --disable-clang-plugin
+fi

--- a/mail/config/mozconfigs/macosx64/release
+++ b/mail/config/mozconfigs/macosx64/release
@@ -21,8 +21,13 @@ MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=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
+
+if [ "$MOZ_IS_COMM_TOPDIR" != "1" ]; then
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1419472
+  ac_add_options --disable-clang-plugin
+fi