Commit 17f2faa3 authored by brettw@chromium.org's avatar brettw@chromium.org

Hook up the tsan flag for the GN build.

Add a flag to disable GLIBCXX_DEBUG which is used in the GYP build on some bots.

TBR=scottmg

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245577 0039d316-1c4b-4281-b951-d872f2087c98
parent 97fb1c82
......@@ -2,6 +2,14 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
declare_args() {
# When set, turns off the definition of _GLIBCXX_DEBUG when it would
# otherwise be set. Setting _GLIBCXX_DEBUG adds iterator debugging stuff
# that is usually helpful in debugging, but can cause problems in some
# contexts.
disable_glibcxx_debug = false
}
config("my_msvs") {
defines = [
"CHROMIUM_BUILD",
......@@ -48,7 +56,7 @@ config("debug") {
"WTF_USE_DYNAMIC_ANNOTATIONS=1",
]
if (is_linux && !is_android && cpu_arch == "x64") {
if (is_linux && !is_android && cpu_arch == "x64" && !disable_glibcxx_debug) {
# Enable libstdc++ debugging facilities to help catch problems early, see
# http://crbug.com/65151 .
# TODO(phajdan.jr): Should we enable this for all of POSIX?
......
......@@ -177,6 +177,7 @@ def GetArgsStringForGN(supplemental_files):
('buildtype', 'Official', 'is_official_build=true'),
('component', 'shared_library', 'is_component_build=true'),
('clang', '1', 'is_clang=true'),
('disable_glibcxx_debug', '1', 'disable_glibcxx_debug=true'),
('target_arch', 'ia32', 'cpu_arch="x86"'),
('target_arch', 'x64', 'cpu_arch="x64" force_win64=true'),
('target_arch', 'arm', 'cpu_arch="arm"'),
......@@ -191,6 +192,7 @@ def GetArgsStringForGN(supplemental_files):
('use_goma', '1', 'use_goma=true'),
('asan', '1', 'is_asan=true'),
('lsan', '1', 'is_lsan=true'),
('tsan', '1', 'is_tsan=true'),
]
for i in remap_cases:
if i[0] in vars_dict and vars_dict[i[0]] == i[1]:
......
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