summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoyee Cheung <joyeec9h3@gmail.com>2019-04-23 22:21:52 +0800
committerMichaƫl Zasso <targos@protonmail.com>2019-04-27 11:36:01 +0200
commit50234460f9c39f50504fcef067ad0730eca65414 (patch)
tree2ef6f0afe45c1384a02d0a8303b42f2bc2568e9a
parentd62a3243b1841437e201331e9df09dad7d2db39e (diff)
downloadandroid-node-v8-50234460f9c39f50504fcef067ad0730eca65414.tar.gz
android-node-v8-50234460f9c39f50504fcef067ad0730eca65414.tar.bz2
android-node-v8-50234460f9c39f50504fcef067ad0730eca65414.zip
build: disable custom v8 snapshot by default
This currently breaks `test/pummel/test-hash-seed.js` PR-URL: https://github.com/nodejs/node/pull/27365 Refs: https://github.com/nodejs/node/pull/27321 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
-rwxr-xr-xconfigure.py12
-rw-r--r--node.gyp3
2 files changed, 14 insertions, 1 deletions
diff --git a/configure.py b/configure.py
index 1a0819e741..12d68ccfeb 100755
--- a/configure.py
+++ b/configure.py
@@ -421,6 +421,11 @@ parser.add_option('--with-ltcg',
dest='with_ltcg',
help='Use Link Time Code Generation. This feature is only available on Windows.')
+parser.add_option('--with-node-snapshot',
+ action='store_true',
+ dest='with_node_snapshot',
+ help='Turn on V8 snapshot integration. Currently experimental.')
+
intl_optgroup.add_option('--download',
action='store',
dest='download_list',
@@ -928,6 +933,13 @@ def configure_node(o):
o['variables']['want_separate_host_toolset'] = int(
cross_compiling and want_snapshots)
+ if options.with_node_snapshot:
+ o['variables']['node_use_node_snapshot'] = 'true'
+ else:
+ # Default to false for now.
+ # TODO(joyeecheung): enable it once we fix the hashseed uniqueness
+ o['variables']['node_use_node_snapshot'] = 'false'
+
if target_arch == 'arm':
configure_arm(o)
diff --git a/node.gyp b/node.gyp
index 82efba25d6..53bd954afb 100644
--- a/node.gyp
+++ b/node.gyp
@@ -6,6 +6,7 @@
'node_use_dtrace%': 'false',
'node_use_etw%': 'false',
'node_no_browser_globals%': 'false',
+ 'node_use_node_snapshot%': 'false',
'node_use_v8_platform%': 'true',
'node_use_bundled_v8%': 'true',
'node_shared%': 'false',
@@ -431,7 +432,7 @@
'src/node_code_cache_stub.cc'
],
}],
- ['want_separate_host_toolset==0', {
+ ['node_use_node_snapshot=="true"', {
'dependencies': [
'node_mksnapshot',
],