Bug 1477744 - Re-enable -Werror in clang-cl for Spidermonkey. r=froydnj

--HG--
extra : rebase_source : a2da624418ab3578bfed878628e9ad52beedbbd3
This commit is contained in:
David Major 2018-07-26 16:14:27 -04:00
parent 9e27dd8849
commit f0f43e919c
2 changed files with 8 additions and 8 deletions

View File

@ -1038,7 +1038,12 @@ case "$target" in
CXXFLAGS="$CXXFLAGS -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING"
LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib secur32.lib"
MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
WARNINGS_AS_ERRORS='-WX'
# -Werror is disabled on clang-cl until bug 1090497 cleans up the noise.
if test -n "$CLANG_CL"; then
WARNINGS_AS_ERRORS=''
else
WARNINGS_AS_ERRORS='-WX'
fi
# Use a higher optimization level for clang-cl, so we can come closer
# to MSVC's performance numbers (see bug 1443590).
if test -n "$CLANG_CL"; then

View File

@ -487,16 +487,11 @@ class CompileFlags(BaseCompileFlags):
def _warnings_as_errors(self):
warnings_as_errors = self._context.config.substs.get('WARNINGS_AS_ERRORS')
if self._context.config.substs.get('MOZ_PGO'):
# Don't use warnings-as-errors in Windows PGO builds because it is suspected of
# Don't use warnings-as-errors in MSVC PGO builds because it is suspected of
# causing problems in that situation. (See bug 437002.)
if self._context.config.substs['OS_ARCH'] == 'WINNT':
if self._context.config.substs.get('CC_TYPE') == 'msvc':
warnings_as_errors = None
if self._context.config.substs.get('CC_TYPE') == 'clang-cl':
# Don't use warnings-as-errors in clang-cl because it warns about many more
# things than MSVC does.
warnings_as_errors = None
if warnings_as_errors:
return [warnings_as_errors]