Commit d6edee7b authored by tmoniuszko's avatar tmoniuszko Committed by Commit bot

Handle unpatched VS xtree header

BUG=

Committed: https://crrev.com/b5020725ac56d11c064086295af7db628b4fe64b
Cr-Commit-Position: refs/heads/master@{#318859}

Review URL: https://codereview.chromium.org/965713002

Cr-Commit-Position: refs/heads/master@{#319035}
parent e952a67a
...@@ -48,6 +48,13 @@ declare_args() { ...@@ -48,6 +48,13 @@ declare_args() {
# http://gcc.gnu.org/wiki/DebugFission # http://gcc.gnu.org/wiki/DebugFission
use_debug_fission = use_debug_fission =
!is_win && use_gold && linux_use_bundled_binutils && !use_ccache !is_win && use_gold && linux_use_bundled_binutils && !use_ccache
if (is_win) {
# Whether the VS xtree header has been patched to disable warning 4702. If
# it has, then we don't need to disable 4702 (unreachable code warning).
# The patch is preapplied to the internal toolchain and hence all bots.
msvs_xtree_patched = false
}
} }
# default_include_dirs --------------------------------------------------------- # default_include_dirs ---------------------------------------------------------
...@@ -788,6 +795,14 @@ config("default_warnings") { ...@@ -788,6 +795,14 @@ config("default_warnings") {
"/wd4610", # Class can never be instantiated, constructor required. "/wd4610", # Class can never be instantiated, constructor required.
"/wd4996", # Deprecated function warning. "/wd4996", # Deprecated function warning.
] ]
# VS xtree header file needs to be patched or 4702 (unreachable code
# warning) is reported if _HAS_EXCEPTIONS=0. Disable the warning if xtree is
# not patched.
if (!msvs_xtree_patched &&
exec_script("../../win_is_xtree_patched.py", [], "value") == 0) {
cflags += [ "/wd4702" ] # Unreachable code.
}
} else { } else {
# Common GCC warning setup. # Common GCC warning setup.
cflags = [ cflags = [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment