From 0822bfaa9f52aea289abd0e15a90b0df2e12f7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Fri, 18 Oct 2019 11:18:28 +0200 Subject: [PATCH] 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 Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Richard Lau Reviewed-By: Luigi Pinca --- configure.py | 13 ++++++------- node.gyp | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/configure.py b/configure.py index 7305727c8881e0..f1badfdb932bb9 100755 --- a/configure.py +++ b/configure.py @@ -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', @@ -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) diff --git a/node.gyp b/node.gyp index 9bf8fa2b994da1..ecdecb05f4da8f 100644 --- a/node.gyp +++ b/node.gyp @@ -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',