Skip to content

Commit fd58188

Browse files
inoway46aduh95
inoway46
authored and
aduh95
committed
build: use a single producer for shared generated files
Cross builds instantiate several shared generation actions in both toolsets, producing duplicate output rules that Ninja rejects. Register these actions once in the target toolset and explicitly share them with host consumers. Keep generator executables in the host toolset for cross builds. Refs: #66803 Assisted-by: Codex Signed-off-by: inoway46 <[email protected]> PR-URL: #66804 Reviewed-By: Chengzhong Wu <[email protected]>
1 parent d0c7be4 commit fd58188

5 files changed

Lines changed: 38 additions & 36 deletions

File tree

‎deps/crates/crates.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
# available to load it at runtime.
133133
'target_name': 'temporal_zoneinfo64_data',
134134
'type': 'none',
135-
'toolsets': ['host', 'target'],
135+
'toolsets': ['target'],
136136
'hard_dependency': 1,
137137
'direct_dependent_settings': {
138138
'sources': [

‎src/inspector/node_inspector.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
],
114114
'dependencies': [
115115
'<(protocol_tool_path)/inspector_protocol.gyp:crdtp',
116-
'<(v8_gypfiles_dir)/v8.gyp:v8_inspector_headers',
116+
'<(v8_gypfiles_dir)/v8.gyp:v8_inspector_headers#target',
117117
],
118118
'actions': [
119119
{

‎tools/v8_gypfiles/d8.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
'v8.gyp:v8',
2020
'v8.gyp:v8_libbase',
2121
'v8.gyp:v8_libplatform',
22-
'v8.gyp:generate_bytecode_builtins_list',
22+
'v8.gyp:generate_bytecode_builtins_list#target',
2323
'v8.gyp:fp16',
2424
],
2525
# Generated source files need this explicitly:

‎tools/v8_gypfiles/v8.gyp‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,11 @@
101101
],
102102
}, # v8_pch
103103
{
104+
# Shared generated sources have one producer for both toolsets. In cross
105+
# builds, the executable used by this action still belongs to the host.
104106
'target_name': 'run_torque',
105107
'type': 'none',
106-
'toolsets': ['host', 'target'],
108+
'toolsets': ['target'],
107109
'conditions': [
108110
['want_separate_host_toolset', {
109111
'dependencies': ['torque#host'],
@@ -195,8 +197,8 @@
195197
'toolsets': ['host', 'target'],
196198
'hard_dependency': 1,
197199
'dependencies': [
198-
'generate_bytecode_builtins_list',
199-
'run_torque',
200+
'generate_bytecode_builtins_list#target',
201+
'run_torque#target',
200202
'v8_base_without_compiler',
201203
'torque_runtime_support',
202204
'v8_maybe_icu',
@@ -218,8 +220,8 @@
218220
'toolsets': ['host', 'target'],
219221
'hard_dependency': 1,
220222
'dependencies': [
221-
'generate_bytecode_builtins_list',
222-
'run_torque',
223+
'generate_bytecode_builtins_list#target',
224+
'run_torque#target',
223225
'v8_internal_headers',
224226
'v8_libbase',
225227
'v8_maybe_icu',
@@ -244,7 +246,7 @@
244246
'target_name': 'generate_bytecode_builtins_list',
245247
'type': 'none',
246248
'hard_dependency': 1,
247-
'toolsets': ['host', 'target'],
249+
'toolsets': ['target'],
248250
'conditions': [
249251
['want_separate_host_toolset', {
250252
'dependencies': ['bytecode_builtins_list_generator#host'],
@@ -285,8 +287,8 @@
285287
'type': 'static_library',
286288
'toolsets': ['host', 'target'],
287289
'dependencies': [
288-
'generate_bytecode_builtins_list',
289-
'run_torque',
290+
'generate_bytecode_builtins_list#target',
291+
'run_torque#target',
290292
'v8_base_without_compiler',
291293
'v8_initializers',
292294
'v8_maybe_icu',
@@ -505,8 +507,8 @@
505507
}],
506508
['want_separate_host_toolset', {
507509
'dependencies': [
508-
'generate_bytecode_builtins_list',
509-
'run_torque',
510+
'generate_bytecode_builtins_list#target',
511+
'run_torque#target',
510512
'mksnapshot#host',
511513
'v8_maybe_icu',
512514
# [GYP] added explicitly, instead of inheriting from the other deps
@@ -517,8 +519,8 @@
517519
]
518520
}, {
519521
'dependencies': [
520-
'generate_bytecode_builtins_list',
521-
'run_torque',
522+
'generate_bytecode_builtins_list#target',
523+
'run_torque#target',
522524
'mksnapshot',
523525
'v8_maybe_icu',
524526
# [GYP] added explicitly, instead of inheriting from the other deps
@@ -639,8 +641,8 @@
639641
'v8_maybe_icu',
640642
'v8_shared_internal_headers',
641643
'v8_heap_base_headers',
642-
'generate_bytecode_builtins_list',
643-
'run_torque',
644+
'generate_bytecode_builtins_list#target',
645+
'run_torque#target',
644646
'v8_libbase',
645647
'fp16',
646648
],
@@ -969,8 +971,8 @@
969971
'type': 'static_library',
970972
'toolsets': ['host', 'target'],
971973
'dependencies': [
972-
'generate_bytecode_builtins_list',
973-
'run_torque',
974+
'generate_bytecode_builtins_list#target',
975+
'run_torque#target',
974976
'v8_maybe_icu',
975977
'v8_base_without_compiler',
976978
'v8_internal_headers',
@@ -991,8 +993,8 @@
991993
'type': 'static_library',
992994
'toolsets': ['host', 'target'],
993995
'dependencies': [
994-
'generate_bytecode_builtins_list',
995-
'run_torque',
996+
'generate_bytecode_builtins_list#target',
997+
'run_torque#target',
996998
'v8_internal_headers',
997999
'v8_maybe_icu',
9981000
'v8_base_without_compiler',
@@ -1027,8 +1029,8 @@
10271029
'toolsets': ['host', 'target'],
10281030
'hard_dependency': 1,
10291031
'dependencies': [
1030-
'generate_bytecode_builtins_list',
1031-
'run_torque',
1032+
'generate_bytecode_builtins_list#target',
1033+
'run_torque#target',
10321034
'v8_maybe_icu',
10331035
],
10341036
'conditions': [
@@ -1052,7 +1054,7 @@
10521054
{
10531055
'target_name': 'v8_inspector_headers',
10541056
'type': 'none',
1055-
'toolsets': ['host', 'target'],
1057+
'toolsets': ['target'],
10561058
'hard_dependency': 1,
10571059
'includes': ['inspector.gypi'],
10581060
'direct_dependent_settings': {
@@ -1110,13 +1112,13 @@
11101112
'v8_bigint',
11111113
'v8_headers',
11121114
'v8_heap_base',
1113-
'v8_inspector_headers',
1115+
'v8_inspector_headers#target',
11141116
'v8_libbase',
11151117
'v8_shared_internal_headers',
11161118
'v8_version',
11171119
'cppgc_base',
1118-
'generate_bytecode_builtins_list',
1119-
'run_torque',
1120+
'generate_bytecode_builtins_list#target',
1121+
'run_torque#target',
11201122
'v8_internal_headers',
11211123
'v8_maybe_icu',
11221124
'v8_zlib',
@@ -1163,7 +1165,7 @@
11631165
}],
11641166
['v8_enable_i18n_support==0', {
11651167
'dependencies': [
1166-
'../../deps/crates/crates.gyp:temporal_zoneinfo64_data',
1168+
'../../deps/crates/crates.gyp:temporal_zoneinfo64_data#target',
11671169
],
11681170
}],
11691171
],
@@ -1377,7 +1379,7 @@
13771379
}],
13781380
['v8_enable_i18n_support==1', {
13791381
'dependencies': [
1380-
'run_gen-regexp-special-case',
1382+
'run_gen-regexp-special-case#target',
13811383
],
13821384
'sources': [
13831385
'<(SHARED_INTERMEDIATE_DIR)/src/regexp/special-case.cc',
@@ -2058,7 +2060,7 @@
20582060
{
20592061
'target_name': 'run_gen-regexp-special-case',
20602062
'type': 'none',
2061-
'toolsets': ['host', 'target'],
2063+
'toolsets': ['target'],
20622064
'conditions': [
20632065
['want_separate_host_toolset', {
20642066
'dependencies': ['gen-regexp-special-case#host'],
@@ -2298,8 +2300,8 @@
22982300
{
22992301
'target_name': 'postmortem-metadata',
23002302
'type': 'none',
2301-
'toolsets': ['host', 'target'],
2302-
'dependencies': ['run_torque'],
2303+
'toolsets': ['target'],
2304+
'dependencies': ['run_torque#target'],
23032305
'variables': {
23042306
'heapobject_files': [
23052307
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/instance-types.h',

‎tools/v8_gypfiles/v8_debug_helper.gyp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
'dependencies': [
3737
'gen_heap_constants',
3838

39-
'v8.gyp:generate_bytecode_builtins_list',
40-
'v8.gyp:run_torque',
39+
'v8.gyp:generate_bytecode_builtins_list#target',
40+
'v8.gyp:run_torque#target',
4141
'v8.gyp:v8_maybe_icu',
4242
'v8.gyp:fp16',
4343
'v8.gyp:v8_libbase',
@@ -161,8 +161,8 @@
161161
'v8.gyp:v8_libplatform',
162162
'v8.gyp:v8_maybe_icu',
163163
'v8.gyp:fp16',
164-
'v8.gyp:generate_bytecode_builtins_list',
165-
'v8.gyp:run_torque',
164+
'v8.gyp:generate_bytecode_builtins_list#target',
165+
'v8.gyp:run_torque#target',
166166
],
167167
'conditions': [
168168
['node_shared_abseil=="false"', {

0 commit comments

Comments
 (0)