Skip to content

Commit 17d4368

Browse files
hashseedMylesBorins
authored andcommittedApr 11, 2018
deps: split v8_monolith target into separate file
Even if we only use v8_monolith build target, other targets in v8.gyp with possibly outdated file lists are parsed and could cause build to fail even with --build-v8-with-gn. PR-URL: #19201 Reviewed-By: Ali Ijaz Sheikh <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent 5c93b3b commit 17d4368

File tree

4 files changed

+59
-39
lines changed

4 files changed

+59
-39
lines changed
 

‎common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
# Reset this number to 0 on major V8 upgrades.
2929
# Increment by one for each non-official patch applied to deps/v8.
30-
'v8_embedder_string': '-node.1',
30+
'v8_embedder_string': '-node.2',
3131

3232
# Enable disassembler for `--print-code` v8 options
3333
'v8_enable_disassembler': 1,

‎deps/v8/gypfiles/v8-monolithic.gyp

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Copyright 2018 the V8 project authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
{
6+
'variables': {
7+
'v8_code': 1,
8+
'v8_random_seed%': 314159265,
9+
'v8_vector_stores%': 0,
10+
'embed_script%': "",
11+
'warmup_script%': "",
12+
'v8_extra_library_files%': [],
13+
'v8_experimental_extra_library_files%': [],
14+
'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
15+
'v8_os_page_size%': 0,
16+
},
17+
'includes': ['toolchain.gypi', 'features.gypi', 'inspector.gypi'],
18+
'targets': [
19+
{
20+
'target_name': 'v8_monolith',
21+
'type': 'none',
22+
'direct_dependent_settings': {
23+
'include_dirs': [
24+
'../include/',
25+
],
26+
},
27+
'actions': [
28+
{
29+
'action_name': 'build_with_gn',
30+
'inputs': [
31+
'../tools//node/build_gn.py',
32+
],
33+
'outputs': [
34+
'<(INTERMEDIATE_DIR)/gn/obj/libv8_monolith.a',
35+
'<(INTERMEDIATE_DIR)/gn/args.gn',
36+
],
37+
'action': [
38+
'../tools//node/build_gn.py',
39+
'--mode', '<(CONFIGURATION_NAME)',
40+
'--v8_path', '../',
41+
'--build_path', '<(INTERMEDIATE_DIR)/gn',
42+
'--host_os', '<(host_os)',
43+
'--flag', 'v8_promise_internal_field_count=<(v8_promise_internal_field_count)',
44+
'--flag', 'target_cpu="<(target_arch)"',
45+
'--flag', 'target_os="<(OS)"',
46+
'--flag', 'v8_target_cpu="<(v8_target_arch)"',
47+
'--flag', 'v8_embedder_string="<(v8_embedder_string)"',
48+
'--flag', 'v8_use_snapshot=<(v8_use_snapshot)',
49+
'--flag', 'v8_optimized_debug=<(v8_optimized_debug)',
50+
'--flag', 'v8_enable_disassembler=<(v8_enable_disassembler)',
51+
'--flag', 'v8_postmortem_support=<(v8_postmortem_support)',
52+
],
53+
},
54+
],
55+
},
56+
],
57+
}

‎deps/v8/gypfiles/v8.gyp

-37
Original file line numberDiff line numberDiff line change
@@ -2580,42 +2580,5 @@
25802580
},
25812581
],
25822582
},
2583-
{
2584-
'target_name': 'v8_monolith',
2585-
'type': 'none',
2586-
'direct_dependent_settings': {
2587-
'include_dirs': [
2588-
'../include/',
2589-
],
2590-
},
2591-
'actions': [
2592-
{
2593-
'action_name': 'build_with_gn',
2594-
'inputs': [
2595-
'../tools//node/build_gn.py',
2596-
],
2597-
'outputs': [
2598-
'<(INTERMEDIATE_DIR)/gn/obj/libv8_monolith.a',
2599-
'<(INTERMEDIATE_DIR)/gn/args.gn',
2600-
],
2601-
'action': [
2602-
'../tools//node/build_gn.py',
2603-
'--mode', '<(CONFIGURATION_NAME)',
2604-
'--v8_path', '../',
2605-
'--build_path', '<(INTERMEDIATE_DIR)/gn',
2606-
'--host_os', '<(host_os)',
2607-
'--flag', 'v8_promise_internal_field_count=<(v8_promise_internal_field_count)',
2608-
'--flag', 'target_cpu="<(target_arch)"',
2609-
'--flag', 'target_os="<(OS)"',
2610-
'--flag', 'v8_target_cpu="<(v8_target_arch)"',
2611-
'--flag', 'v8_embedder_string="<(v8_embedder_string)"',
2612-
'--flag', 'v8_use_snapshot=<(v8_use_snapshot)',
2613-
'--flag', 'v8_optimized_debug=<(v8_optimized_debug)',
2614-
'--flag', 'v8_enable_disassembler=<(v8_enable_disassembler)',
2615-
'--flag', 'v8_postmortem_support=<(v8_postmortem_support)',
2616-
],
2617-
},
2618-
],
2619-
},
26202583
],
26212584
}

‎node.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
[ 'node_use_bundled_v8=="true"', {
6262
'conditions': [
6363
[ 'build_v8_with_gn=="true"', {
64-
'dependencies': ['deps/v8/gypfiles/v8.gyp:v8_monolith'],
64+
'dependencies': ['deps/v8/gypfiles/v8-monolithic.gyp:v8_monolith'],
6565
}, {
6666
'dependencies': [
6767
'deps/v8/gypfiles/v8.gyp:v8',

0 commit comments

Comments
 (0)
Please sign in to comment.