Bug 1627437 - Follow-up: Temporarily disable clang-plugin on Thunderbird release/beta. r=mkmelin a=rjl THUNDERBIRD_76_0b1_BUILD2 THUNDERBIRD_76_0b1_RELEASE
authorRob Lemley <rob@thunderbird.net>
Mon, 06 Apr 2020 17:04:34 -0400
changeset 37814 73855ae9feac41474c1dc237b13b1cab9fe78fa8
parent 37813 064a1bde2f2c030638ef8fe9e141674b7d0a5ec8
child 37815 fc64ed9c690889e785b6b6d7094a55ac396f99ff
push id2585
push userthunderbird@calypsoblue.org
push dateTue, 07 Apr 2020 17:30:03 +0000
treeherdercomm-beta@73855ae9feac [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin, rjl
bugs1627437
Bug 1627437 - Follow-up: Temporarily disable clang-plugin on Thunderbird release/beta. r=mkmelin a=rjl
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,8 +2,12 @@ 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,11 +14,8 @@ 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/win32/common-win32"
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
-. "$topsrcdir/comm/mail/config/mozconfigs/win32/common-win32"
 
 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/win64/common-win64"
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
-. "$topsrcdir/comm/mail/config/mozconfigs/win64/common-win64"
 
 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