Bug 1627437 Backed out changeset 3cdb2ce79d79 (bug 1627437) now that 1627437 is fixed (adjustments for nsITransaction::Do/UndoTransaction MOZ_CAN_RUN_SCRIPT). r=backout a=wsmwk
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Tue, 28 Apr 2020 13:48:14 +0300
changeset 37833 12de722b5dc20b1d13ad51af831225270d31e82d
parent 37832 c6fef8bbb3fc779a2acac3b7ba0032924911dd1f
child 37834 da0a04cfc0497609fe596b2ba2ea7d8400e1dcda
push id2592
push userthunderbird@calypsoblue.org
push dateTue, 28 Apr 2020 16:34:52 +0000
treeherdercomm-beta@9c50eec1c6cd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, wsmwk
bugs1627437
Bug 1627437 Backed out changeset 3cdb2ce79d79 (bug 1627437) now that 1627437 is fixed (adjustments for nsITransaction::Do/UndoTransaction MOZ_CAN_RUN_SCRIPT). r=backout a=wsmwk
mail/config/mozconfigs/common
mail/config/mozconfigs/macosx64/nightly
mail/config/mozconfigs/win32/release
mail/config/mozconfigs/win64/release
--- a/mail/config/mozconfigs/common
+++ b/mail/config/mozconfigs/common
@@ -2,12 +2,8 @@ ac_add_options --enable-application=comm
 
 # 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
-# Think different.
-if [ -n "$MACOS_SDK_DIR" ]; then
-ac_add_options --disable-clang-plugin
-fi
--- a/mail/config/mozconfigs/macosx64/nightly
+++ b/mail/config/mozconfigs/macosx64/nightly
@@ -14,8 +14,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/release
+++ b/mail/config/mozconfigs/win32/release
@@ -1,13 +1,13 @@
 . "$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
 ac_add_options --enable-official-branding
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
--- a/mail/config/mozconfigs/win64/release
+++ b/mail/config/mozconfigs/win64/release
@@ -1,13 +1,13 @@
 . "$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
 ac_add_options --enable-official-branding
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1