summaryrefslogtreecommitdiff
path: root/deps/v8/src/base.isolate
diff options
context:
space:
mode:
Diffstat (limited to 'deps/v8/src/base.isolate')
-rw-r--r--deps/v8/src/base.isolate46
1 files changed, 45 insertions, 1 deletions
diff --git a/deps/v8/src/base.isolate b/deps/v8/src/base.isolate
index dceb413339..097b914399 100644
--- a/deps/v8/src/base.isolate
+++ b/deps/v8/src/base.isolate
@@ -2,8 +2,19 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
+ 'includes': [
+ '../third_party/icu/icu.isolate',
+ '../build/config/win/msvs_dependencies.isolate',
+ ],
'conditions': [
- ['v8_use_external_startup_data==1', {
+ ['use_custom_libcxx==1', {
+ 'variables': {
+ 'files': [
+ '<(PRODUCT_DIR)/lib/libc++.so',
+ ],
+ },
+ }],
+ ['v8_use_snapshot=="true" and v8_use_external_startup_data==1', {
'variables': {
'files': [
'<(PRODUCT_DIR)/natives_blob.bin',
@@ -11,5 +22,38 @@
],
},
}],
+ ['OS=="linux" and component=="shared_library" and target_arch=="ia32"', {
+ 'variables': {
+ 'files': [
+ '<(PRODUCT_DIR)/lib/',
+ ],
+ },
+ }],
+ ['tsan==1', {
+ 'variables': {
+ 'files': [
+ '../tools/sanitizers/tsan_suppressions.txt',
+ ],
+ },
+ }],
+ ['OS=="linux" and (asan==1 or cfi_vptr==1 or msan==1 or tsan==1)', {
+ 'variables': {
+ 'files': [
+ # For llvm-symbolizer.
+ '../third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6',
+ ],
+ },
+ }],
+ ['asan==1 or cfi_vptr==1 or msan==1 or tsan==1', {
+ 'variables': {
+ 'files': [
+ '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUTABLE_SUFFIX)',
+ ],
+ },
+ }],
+ # Workaround for https://code.google.com/p/swarming/issues/detail?id=211
+ ['asan==0 or cfi_vptr==0 or msan==0 or tsan==0', {
+ 'variables': {},
+ }],
],
} \ No newline at end of file