# HG changeset patch
# User Mike Hommey <mh+mozilla@glandium.org>
# Date 1539816306 0
# Node ID 60d974e18e6ac10231d7105582c026fc74e16a69
# Parent  e877028cbffd31d59c6e74df1e961577a963ad55
Bug 1486554 - Enable static analysis on normal Windows CI builds r=ted

And turn off separate static analysis build tasks.

Differential Revision: https://phabricator.services.mozilla.com/D8810

diff --git a/browser/config/mozconfigs/win32/debug-msvc b/browser/config/mozconfigs/win32/debug-msvc
--- a/browser/config/mozconfigs/win32/debug-msvc
+++ b/browser/config/mozconfigs/win32/debug-msvc
@@ -1,8 +1,9 @@
 . "$topsrcdir/browser/config/mozconfigs/win32/debug"
 
 export CC="cl.exe"
 export CXX="cl.exe"
 export LINKER="link.exe"
 
 export HOST_CC=${VSPATH}/VC/bin/Hostx64/x64/cl.exe
 export HOST_CXX=${VSPATH}/VC/bin/Hostx64/x64/cl.exe
+unset ENABLE_CLANG_PLUGIN
diff --git a/browser/config/mozconfigs/win32/opt-msvc b/browser/config/mozconfigs/win32/opt-msvc
--- a/browser/config/mozconfigs/win32/opt-msvc
+++ b/browser/config/mozconfigs/win32/opt-msvc
@@ -1,8 +1,9 @@
 . "$topsrcdir/browser/config/mozconfigs/win32/nightly"
 
 export CC="cl.exe"
 export CXX="cl.exe"
 export LINKER="link.exe"
 
 export HOST_CC=${VSPATH}/VC/bin/Hostx64/x64/cl.exe
 export HOST_CXX=${VSPATH}/VC/bin/Hostx64/x64/cl.exe
+unset ENABLE_CLANG_PLUGIN
diff --git a/browser/config/mozconfigs/win64/debug-msvc b/browser/config/mozconfigs/win64/debug-msvc
--- a/browser/config/mozconfigs/win64/debug-msvc
+++ b/browser/config/mozconfigs/win64/debug-msvc
@@ -1,5 +1,6 @@
 . "$topsrcdir/browser/config/mozconfigs/win64/debug"
 
 export CC="cl.exe"
 export CXX="cl.exe"
 export LINKER="link.exe"
+unset ENABLE_CLANG_PLUGIN
diff --git a/browser/config/mozconfigs/win64/opt-msvc b/browser/config/mozconfigs/win64/opt-msvc
--- a/browser/config/mozconfigs/win64/opt-msvc
+++ b/browser/config/mozconfigs/win64/opt-msvc
@@ -1,5 +1,6 @@
 . "$topsrcdir/browser/config/mozconfigs/win64/nightly"
 
 export CC="cl.exe"
 export CXX="cl.exe"
 export LINKER="link.exe"
+unset ENABLE_CLANG_PLUGIN
diff --git a/build/mozconfig.clang-cl b/build/mozconfig.clang-cl
--- a/build/mozconfig.clang-cl
+++ b/build/mozconfig.clang-cl
@@ -7,8 +7,9 @@ if test -d "$topsrcdir/clang/bin"; then
         CLANG_LIB_DIR="$(cd $topsrcdir/clang/lib/clang/* && cd lib/windows && pwd)"
         export LIB=$LIB:$CLANG_LIB_DIR
         mk_export_correct_style LIB
     fi
 fi
 
 export CC=clang-cl
 export CXX=clang-cl
+export ENABLE_CLANG_PLUGIN=1