Bug 1627437 - Follow-up: Temporarily disable clang-plugin on Thunderbird release/beta. r=mkmelin

--HG--
extra : rebase_source : afb8296d94d997f775928291998bb865dd5bf16d
extra : histedit_source : 584f09886b7a74f9cd84ac4bb86335ab088193ac

mail/config/mozconfigs/common

@@ -7,3 +7,7 @@ MOZ_REQUIRE_SIGNING=0
 
 # Temporarily disable CLANG_PLUGIN - Bug 1627437
 unset ENABLE_CLANG_PLUGIN
+# Think different.
+if [ -n "$MACOS_SDK_DIR" ]; then
+ac_add_options --disable-clang-plugin
+fi

mail/config/mozconfigs/macosx64/nightly

@@ -20,6 +20,3 @@ export MOZ_PACKAGE_JSSHELL=1
 
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
-
-# Temporarily disable CLANG_PLUGIN - Bug 1627437
-ac_add_options --disable-clang-plugin

mail/config/mozconfigs/win32/release

@@ -1,8 +1,8 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
-. "$topsrcdir/comm/mail/config/mozconfigs/common"
 . "$topsrcdir/comm/mail/config/mozconfigs/win32/common-win32"
+. "$topsrcdir/comm/mail/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-jemalloc

mail/config/mozconfigs/win64/release

@@ -1,8 +1,8 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
-. "$topsrcdir/comm/mail/config/mozconfigs/common"
 . "$topsrcdir/comm/mail/config/mozconfigs/win64/common-win64"
+. "$topsrcdir/comm/mail/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-jemalloc