Commit ec34e26c authored by Robert Liao's avatar Robert Liao Committed by Commit Bot

Add libcxx_natvis_include to C++ BUILD.gn to Allow Windbg Hang Workaround

BUG=966676,966687

Change-Id: Icc3899aaf5483916cb5368c5a334116d1f7928ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1632712
Auto-Submit: Robert Liao <robliao@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663873}
parent e1714a39
...@@ -15,6 +15,11 @@ declare_args() { ...@@ -15,6 +15,11 @@ declare_args() {
# TODO(thomasanderson): Set this to true by default once rL352899 is available # TODO(thomasanderson): Set this to true by default once rL352899 is available
# in MacOS's lldb. # in MacOS's lldb.
libcxx_abi_unstable = !((is_mac || is_ios) && is_debug && is_component_build) libcxx_abi_unstable = !((is_mac || is_ios) && is_debug && is_component_build)
# Builds libcxx Natvis into the symbols for type visualization.
# Set to false to workaround http://crbug.com/966676 and
# http://crbug.com/966687.
libcxx_natvis_include = true
} }
# TODO(xiaohuic): https://crbug/917533 Crashes on internal ChromeOS build. # TODO(xiaohuic): https://crbug/917533 Crashes on internal ChromeOS build.
...@@ -78,7 +83,9 @@ config("runtime_library") { ...@@ -78,7 +83,9 @@ config("runtime_library") {
# Add a debug visualizer for Microsoft's debuggers so that they can display # Add a debug visualizer for Microsoft's debuggers so that they can display
# libc++ types well. # libc++ types well.
ldflags += [ "/NATVIS:" + rebase_path("libc++.natvis", root_build_dir) ] if (libcxx_natvis_include) {
ldflags += [ "/NATVIS:" + rebase_path("libc++.natvis", root_build_dir) ]
}
} else { } else {
cflags_cc += [ cflags_cc += [
"-nostdinc++", "-nostdinc++",
......
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