Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: build/standalone.gypi

Issue 1143173005: [test] Use instrumented libc++ for asan and tsan builds. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index dc4ce0084a0fe88dfe590696cab353191bc86d34..1855d7c06c9e976d25390a8cd9a4c8b9ae7bbdfa 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -80,6 +80,10 @@
# also controls coverage granularity (1 for function-level, 2 for
# block-level, 3 for edge-level).
'sanitizer_coverage%': 0,
+ # Use libc++ (buildtools/third_party/libc++ and
+ # buildtools/third_party/libc++abi) instead of stdlibc++ as standard
+ # library. This is intended to be used for instrumented builds.
+ 'use_custom_libcxx%': 0,
# goma settings.
# 1 to use goma.
@@ -106,6 +110,7 @@
'msan%': '<(msan)',
'tsan%': '<(tsan)',
'sanitizer_coverage%': '<(sanitizer_coverage)',
+ 'use_custom_libcxx%': '<(use_custom_libcxx)',
# Add a simple extra solely for the purpose of the cctests
'v8_extra_library_files': ['../test/cctest/test-extra.js'],
@@ -184,6 +189,18 @@
'clang%': 1,
'use_allocator%': 'none',
}],
+ ['asan==1 and OS=="linux"', {
+ 'use_custom_libcxx%': 1,
+ }],
+ ['tsan==1', {
+ 'use_custom_libcxx%': 1,
+ }],
+ ['msan==1', {
+ # Use a just-built, MSan-instrumented libc++ instead of the system-wide
+ # libstdc++. This is required to avoid false positive reports whenever
+ # the C++ standard library is used.
+ 'use_custom_libcxx%': 1,
+ }],
],
# Default ARM variable settings.
'arm_version%': 'default',
@@ -371,13 +388,9 @@
],
}],
],
- # TODO(machenbach): Share this between all *san configs like in
- # common.gypi.
+ }],
+ ['use_custom_libcxx==1', {
'dependencies': [
- # Use libc++ (buildtools/third_party/libc++ and
- # buildtools/third_party/libc++abi) instead of stdlibc++ as
- # standard library. This is intended to be used for for
- # instrumented builds.
'<(DEPTH)/buildtools/third_party/libc++/libc++.gyp:libcxx_proxy',
],
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698