Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: make configure --without-snapshot a no-op #30021

Closed
wants to merge 1 commit into from
Closed

build: make configure --without-snapshot a no-op #30021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@

parser.add_option('--without-snapshot',
action='store_true',
dest='without_snapshot',
dest='unused_without_snapshot',
help=optparse.SUPPRESS_HELP)

parser.add_option('--without-siphash',
Expand Down Expand Up @@ -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'

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion node.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
'variables': {
'v8_use_siphash%': 0,
'v8_use_snapshot%': 0,
'v8_use_snapshot%': 1,
'v8_trace_maps%': 0,
'node_use_dtrace%': 'false',
'node_use_etw%': 'false',
Expand Down