Skip to content

Commit

Permalink
build: sync generation of v8_build_config.json
Browse files Browse the repository at this point in the history
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: #38263
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
  • Loading branch information
richardlau committed Apr 18, 2021
1 parent c704faa commit 049b703
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions tools/v8_gypfiles/v8.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand All @@ -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': [
Expand Down

0 comments on commit 049b703

Please sign in to comment.