Skip to content

Commit a25d2fc

Browse files
targosMylesBorins
authored andcommitted
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: #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>
1 parent e04d058 commit a25d2fc

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

configure.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@
507507

508508
parser.add_option('--without-snapshot',
509509
action='store_true',
510-
dest='without_snapshot',
510+
dest='unused_without_snapshot',
511511
help=optparse.SUPPRESS_HELP)
512512

513513
parser.add_option('--without-siphash',
@@ -967,13 +967,13 @@ def configure_node(o):
967967
cross_compiling = (options.cross_compiling
968968
if options.cross_compiling is not None
969969
else target_arch != host_arch)
970-
want_snapshots = not options.without_snapshot
971-
o['variables']['want_separate_host_toolset'] = int(
972-
cross_compiling and want_snapshots)
970+
if options.unused_without_snapshot:
971+
warn('building --without-snapshot is no longer possible')
972+
973+
o['variables']['want_separate_host_toolset'] = int(cross_compiling)
973974

974975
if not options.without_node_snapshot:
975-
o['variables']['node_use_node_snapshot'] = b(
976-
not cross_compiling and want_snapshots)
976+
o['variables']['node_use_node_snapshot'] = b(not cross_compiling)
977977
else:
978978
o['variables']['node_use_node_snapshot'] = 'false'
979979

@@ -1177,7 +1177,6 @@ def configure_v8(o):
11771177
o['variables']['v8_random_seed'] = 0 # Use a random seed for hash tables.
11781178
o['variables']['v8_promise_internal_field_count'] = 1 # Add internal field to promises for async hooks.
11791179
o['variables']['v8_use_siphash'] = 0 if options.without_siphash else 1
1180-
o['variables']['v8_use_snapshot'] = 0 if options.without_snapshot else 1
11811180
o['variables']['v8_trace_maps'] = 1 if options.trace_maps else 0
11821181
o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform)
11831182
o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)

node.gyp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
'variables': {
33
'v8_use_siphash%': 0,
4-
'v8_use_snapshot%': 0,
4+
'v8_use_snapshot%': 1,
55
'v8_trace_maps%': 0,
66
'node_use_dtrace%': 'false',
77
'node_use_etw%': 'false',

0 commit comments

Comments
 (0)