Bug 1627437 - Temporarily disable clang-plugin. rs=bustage-fix
authorRob Lemley <rob@thunderbird.net>
Sat, 04 Apr 2020 19:11:10 -0400
changeset 38685 0d3828ea7422b578c0683a2b28d86ee0e8257f80
parent 38684 f511a27de53a2c36c9fcb7b0f6488a277ee18b6f
child 38686 f15b0f3b36af47ec42943e90ad83f1bc7eb5ad48
push id400
push userclokep@gmail.com
push dateMon, 04 May 2020 18:56:09 +0000
reviewersbustage-fix
bugs1627437
Bug 1627437 - Temporarily disable clang-plugin. rs=bustage-fix
mail/config/mozconfigs/common
mail/config/mozconfigs/macosx64/debug
mail/config/mozconfigs/macosx64/nightly
mail/config/mozconfigs/win32/debug
mail/config/mozconfigs/win64/debug
--- a/mail/config/mozconfigs/common
+++ b/mail/config/mozconfigs/common
@@ -1,6 +1,9 @@
 ac_add_options --enable-application=comm/mail
 
 # Disable enforcing that add-ons are signed by the trusted root.
 MOZ_REQUIRE_SIGNING=0
 
 . "$topsrcdir/build/mozconfig.common.override"
+
+# Temporarily disable CLANG_PLUGIN - Bug 1627437
+unset ENABLE_CLANG_PLUGIN
--- a/mail/config/mozconfigs/macosx64/debug
+++ b/mail/config/mozconfigs/macosx64/debug
@@ -11,8 +11,11 @@ export MOZILLA_OFFICIAL=1
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
+
+# Temporarily disable CLANG_PLUGIN - Bug 1627437
+ac_add_options --disable-clang-plugin
--- a/mail/config/mozconfigs/macosx64/nightly
+++ b/mail/config/mozconfigs/macosx64/nightly
@@ -15,8 +15,11 @@ export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # Package js shell
 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
--- a/mail/config/mozconfigs/win32/debug
+++ b/mail/config/mozconfigs/win32/debug
@@ -1,22 +1,23 @@
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/comm/build/mozconfig.comm-sccache"
 . "$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"
 
 ac_add_options --enable-debug
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # 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/comm/mail/config/mozconfigs/common"
--- a/mail/config/mozconfigs/win64/debug
+++ b/mail/config/mozconfigs/win64/debug
@@ -1,22 +1,23 @@
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/comm/build/mozconfig.comm-sccache"
 . "$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"
 
 ac_add_options --enable-debug
 if test -n "$USE_ARTIFACT"; then
 ac_add_options --disable-mapi
 fi
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
+
+. "$topsrcdir/comm/mail/config/mozconfigs/common"