summaryrefslogtreecommitdiff
path: root/deps/v8/gypfiles
diff options
context:
space:
mode:
authorMichaël Zasso <targos@protonmail.com>2017-06-06 10:28:14 +0200
committerMichaël Zasso <targos@protonmail.com>2017-06-07 10:33:31 +0200
commit3dc8c3bed4cf3a77607edbb0b015e33f8b60fc09 (patch)
tree9dee56e142638b34f1eccbd0ad88c3bce5377c29 /deps/v8/gypfiles
parent91a1bbe3055a660194ca4d403795aa0c03e9d056 (diff)
downloadandroid-node-v8-3dc8c3bed4cf3a77607edbb0b015e33f8b60fc09.tar.gz
android-node-v8-3dc8c3bed4cf3a77607edbb0b015e33f8b60fc09.tar.bz2
android-node-v8-3dc8c3bed4cf3a77607edbb0b015e33f8b60fc09.zip
deps: update V8 to 5.9.211.32
PR-URL: https://github.com/nodejs/node/pull/13263 Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com>
Diffstat (limited to 'deps/v8/gypfiles')
-rw-r--r--deps/v8/gypfiles/all.gyp12
-rw-r--r--deps/v8/gypfiles/features.gypi3
-rw-r--r--deps/v8/gypfiles/isolate.gypi1
-rw-r--r--deps/v8/gypfiles/standalone.gypi25
-rw-r--r--deps/v8/gypfiles/toolchain.gypi1
5 files changed, 10 insertions, 32 deletions
diff --git a/deps/v8/gypfiles/all.gyp b/deps/v8/gypfiles/all.gyp
index d3e275e10f..bbad66741c 100644
--- a/deps/v8/gypfiles/all.gyp
+++ b/deps/v8/gypfiles/all.gyp
@@ -9,6 +9,7 @@
'type': 'none',
'dependencies': [
'../src/d8.gyp:d8',
+ '../test/inspector/inspector.gyp:*',
],
'conditions': [
['component!="shared_library"', {
@@ -25,20 +26,11 @@
'../test/unittests/unittests.gyp:*',
],
}],
- ['v8_enable_inspector==1', {
- 'dependencies': [
- '../test/inspector/inspector.gyp:*',
- ],
- }],
- ['v8_enable_inspector==1 and test_isolation_mode != "noop"', {
- 'dependencies': [
- '../test/debugger/debugger.gyp:*',
- ],
- }],
['test_isolation_mode != "noop"', {
'dependencies': [
'../test/bot_default.gyp:*',
'../test/benchmarks/benchmarks.gyp:*',
+ '../test/debugger/debugger.gyp:*',
'../test/default.gyp:*',
'../test/intl/intl.gyp:*',
'../test/message/message.gyp:*',
diff --git a/deps/v8/gypfiles/features.gypi b/deps/v8/gypfiles/features.gypi
index bd5cd7cd10..f6a442f663 100644
--- a/deps/v8/gypfiles/features.gypi
+++ b/deps/v8/gypfiles/features.gypi
@@ -142,5 +142,8 @@
], # conditions
}, # Release
}, # configurations
+ 'defines': [
+ 'V8_GYP_BUILD',
+ ], # defines
}, # target_defaults
}
diff --git a/deps/v8/gypfiles/isolate.gypi b/deps/v8/gypfiles/isolate.gypi
index c55f3ca782..af3b3ae5c8 100644
--- a/deps/v8/gypfiles/isolate.gypi
+++ b/deps/v8/gypfiles/isolate.gypi
@@ -82,7 +82,6 @@
'--config-variable', 'sanitizer_coverage=<(sanitizer_coverage)',
'--config-variable', 'component=<(component)',
'--config-variable', 'target_arch=<(target_arch)',
- '--config-variable', 'v8_enable_inspector=<(v8_enable_inspector)',
'--config-variable', 'v8_use_external_startup_data=<(v8_use_external_startup_data)',
'--config-variable', 'v8_use_snapshot=<(v8_use_snapshot)',
],
diff --git a/deps/v8/gypfiles/standalone.gypi b/deps/v8/gypfiles/standalone.gypi
index d438a5aeab..986aaaaebb 100644
--- a/deps/v8/gypfiles/standalone.gypi
+++ b/deps/v8/gypfiles/standalone.gypi
@@ -46,7 +46,6 @@
'msvs_multi_core_compile%': '1',
'mac_deployment_target%': '10.7',
'release_extra_cflags%': '',
- 'v8_enable_inspector%': 0,
'variables': {
'variables': {
'variables': {
@@ -93,16 +92,16 @@
['OS=="linux" and use_sysroot==1', {
'conditions': [
['target_arch=="arm"', {
- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_arm-sysroot',
+ 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_arm-sysroot',
}],
['target_arch=="x64"', {
- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_amd64-sysroot',
+ 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_amd64-sysroot',
}],
['target_arch=="ia32"', {
- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_i386-sysroot',
+ 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_i386-sysroot',
}],
['target_arch=="mipsel"', {
- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_mips-sysroot',
+ 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_mips-sysroot',
}],
],
}], # OS=="linux" and use_sysroot==1
@@ -243,9 +242,6 @@
# Relative path to icu.gyp from this file.
'icu_gyp_path': '../third_party/icu/icu.gyp',
- # Relative path to inspector.gyp from this file.
- 'inspector_gyp_path': '../src/v8-inspector/inspector.gyp',
-
'conditions': [
['(v8_target_arch=="arm" and host_arch!="arm") or \
(v8_target_arch=="arm64" and host_arch!="arm64") or \
@@ -257,18 +253,6 @@
}, {
'want_separate_host_toolset': 0,
}],
- ['(v8_target_arch=="arm" and host_arch!="arm") or \
- (v8_target_arch=="arm64" and host_arch!="arm64") or \
- (v8_target_arch=="mipsel" and host_arch!="mipsel") or \
- (v8_target_arch=="mips64el" and host_arch!="mips64el") or \
- (v8_target_arch=="mips" and host_arch!="mips") or \
- (v8_target_arch=="mips64" and host_arch!="mips64") or \
- (v8_target_arch=="x64" and host_arch!="x64") or \
- (OS=="android" or OS=="qnx")', {
- 'want_separate_host_toolset_mkpeephole': 1,
- }, {
- 'want_separate_host_toolset_mkpeephole': 0,
- }],
['OS == "win"', {
'os_posix%': 0,
}, {
@@ -870,6 +854,7 @@
],
}],
],
+ 'msvs_cygwin_shell': 0,
'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
'msvs_disabled_warnings': [
# C4091: 'typedef ': ignored on left of 'X' when no variable is
diff --git a/deps/v8/gypfiles/toolchain.gypi b/deps/v8/gypfiles/toolchain.gypi
index 88afb8612e..815070a508 100644
--- a/deps/v8/gypfiles/toolchain.gypi
+++ b/deps/v8/gypfiles/toolchain.gypi
@@ -74,7 +74,6 @@
# Chrome needs this definition unconditionally. For standalone V8 builds,
# it's handled in gypfiles/standalone.gypi.
'want_separate_host_toolset%': 1,
- 'want_separate_host_toolset_mkpeephole%': 1,
# Toolset the shell binary should be compiled for. Possible values are
# 'host' and 'target'.