diff options
| author | Michaël Zasso <targos@protonmail.com> | 2019-10-18 11:18:28 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2019-10-20 16:45:35 +0200 |
| commit | 0822bfaa9f52aea289abd0e15a90b0df2e12f7e1 (patch) | |
| tree | 8212544c3b77a592756a52442dc33b01181c134d /configure.py | |
| parent | b554214249b4d03ca68f98f2a2715511a7049397 (diff) | |
| download | android-node-v8-0822bfaa9f52aea289abd0e15a90b0df2e12f7e1.tar.gz android-node-v8-0822bfaa9f52aea289abd0e15a90b0df2e12f7e1.tar.bz2 android-node-v8-0822bfaa9f52aea289abd0e15a90b0df2e12f7e1.zip | |
build: make configure --without-snapshot a no-op
From V8 7.9, the option will no longer exist upstream.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1796325
PR-URL: https://github.com/nodejs/node/pull/30021
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/configure.py b/configure.py index 7305727c88..f1badfdb93 100755 --- a/configure.py +++ b/configure.py @@ -507,7 +507,7 @@ parser.add_option('--with-snapshot', parser.add_option('--without-snapshot', action='store_true', - dest='without_snapshot', + dest='unused_without_snapshot', help=optparse.SUPPRESS_HELP) parser.add_option('--without-siphash', @@ -967,13 +967,13 @@ def configure_node(o): cross_compiling = (options.cross_compiling if options.cross_compiling is not None else target_arch != host_arch) - want_snapshots = not options.without_snapshot - o['variables']['want_separate_host_toolset'] = int( - cross_compiling and want_snapshots) + if options.unused_without_snapshot: + warn('building --without-snapshot is no longer possible') + + o['variables']['want_separate_host_toolset'] = int(cross_compiling) if not options.without_node_snapshot: - o['variables']['node_use_node_snapshot'] = b( - not cross_compiling and want_snapshots) + o['variables']['node_use_node_snapshot'] = b(not cross_compiling) else: o['variables']['node_use_node_snapshot'] = 'false' @@ -1177,7 +1177,6 @@ def configure_v8(o): o['variables']['v8_random_seed'] = 0 # Use a random seed for hash tables. o['variables']['v8_promise_internal_field_count'] = 1 # Add internal field to promises for async hooks. o['variables']['v8_use_siphash'] = 0 if options.without_siphash else 1 - o['variables']['v8_use_snapshot'] = 0 if options.without_snapshot else 1 o['variables']['v8_trace_maps'] = 1 if options.trace_maps else 0 o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform) o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8) |