Commit 420ba82a authored by ulan's avatar ulan Committed by Commit bot

Revert of Handle unpatched VS xtree header (patchset #3 id:40001 of...

Revert of Handle unpatched VS xtree header (patchset #3 id:40001 of https://codereview.chromium.org/965713002/)

Reason for revert:
This broke Win 8 GN builders:

ERROR at //build/config/compiler/BUILD.gn:804:30: Assignment had no effect.
        msvs_xtree_patched = true

Original issue's description:
> Handle unpatched VS xtree header
>
> BUG=
>
> Committed: https://crrev.com/b5020725ac56d11c064086295af7db628b4fe64b
> Cr-Commit-Position: refs/heads/master@{#318859}

TBR=brettw@chromium.org,tmoniuszko@opera.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

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

Cr-Commit-Position: refs/heads/master@{#318861}
parent efd39d01
......@@ -48,13 +48,6 @@ declare_args() {
# http://gcc.gnu.org/wiki/DebugFission
use_debug_fission =
!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 ---------------------------------------------------------
......@@ -795,17 +788,6 @@ config("default_warnings") {
"/wd4610", # Class can never be instantiated, constructor required.
"/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) {
if (exec_script("../../win_is_xtree_patched.py", [], "value") == 1) {
msvs_xtree_patched = true
} else {
cflags += [ "/wd4702" ] # Unreachable code.
}
}
} else {
# Common GCC warning setup.
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