From 049b703a285d4601215172aaa5347ac72d7e2eb0 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 16 Apr 2021 19:49:45 +0100 Subject: [PATCH] build: sync generation of `v8_build_config.json` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The contents of the `v8_build_config.json` file generated when configured with `--enable-d8` is missing entries which prevent V8's test runner from using the built `d8` binary. Sync the keys written into the file with those generated in V8's `deps/v8/BUILD.gn` file. PR-URL: https://github.com/nodejs/node/pull/38263 Reviewed-By: Michaël Zasso Reviewed-By: James M Snell Reviewed-By: Rich Trott --- tools/v8_gypfiles/v8.gyp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index ef5319fa08f0db..ccb5984f47d0d8 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -1509,6 +1509,7 @@ 'variables': { 'v8_dump_build_config_args': [ '<(PRODUCT_DIR)/v8_build_config.json', + 'current_cpu=<(v8_current_cpu)', 'dcheck_always_on=<(dcheck_always_on)', 'is_android=<(is_android)', 'is_asan=<(asan)', @@ -1517,20 +1518,30 @@ 'is_component_build=<(component)', 'is_debug=<(CONFIGURATION_NAME)', # Not available in gyp. + 'is_full_debug=0', + # Not available in gyp. 'is_gcov_coverage=0', 'is_msan=<(msan)', 'is_tsan=<(tsan)', # Not available in gyp. 'is_ubsan_vptr=0', 'target_cpu=<(target_arch)', + 'v8_current_cpu=<(v8_current_cpu)', + # Not available in gyp. + 'v8_enable_atomic_marking_state=0', + # Not available in gyp. + 'v8_enable_atomic_object_field_writes=0', + # Not available in gyp. + 'v8_enable_concurrent_marking=0', 'v8_enable_i18n_support=<(v8_enable_i18n_support)', 'v8_enable_verify_predictable=<(v8_enable_verify_predictable)', - 'v8_target_cpu=<(v8_target_arch)', - 'v8_use_siphash=<(v8_use_siphash)', 'v8_enable_verify_csa=<(v8_enable_verify_csa)', 'v8_enable_lite_mode=<(v8_enable_lite_mode)', 'v8_enable_pointer_compression=<(v8_enable_pointer_compression)', 'v8_enable_webassembly=<(v8_enable_webassembly)', + # Not available in gyp. + 'v8_control_flow_integrity=0', + 'v8_target_cpu=<(v8_target_arch)', ] }, 'conditions': [