Skip to content

Commit 79da253

Browse files
targostargos
committed
tools: update V8 gypfiles for 8.8
Co-authored-by: Jiawen Geng <[email protected]> PR-URL: #36139 Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Shelley Vohr <[email protected]>
1 parent 530ef91 commit 79da253

File tree

2 files changed

+58
-227
lines changed

2 files changed

+58
-227
lines changed

‎tools/v8_gypfiles/toolchain.gypi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,6 @@
11061106
'ENABLE_DISASSEMBLER',
11071107
'V8_ENABLE_CHECKS',
11081108
'OBJECT_PRINT',
1109-
'VERIFY_HEAP',
11101109
'DEBUG',
11111110
'V8_TRACE_MAPS',
11121111
'V8_ENABLE_ALLOCATION_TIMEOUT',

‎tools/v8_gypfiles/v8.gyp‎

Lines changed: 58 additions & 226 deletions
Original file line numberDiff line numberDiff line change
@@ -12,191 +12,22 @@
1212
'v8_os_page_size%': 0,
1313
'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
1414
'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
15-
'torque_files': [
16-
"<(V8_ROOT)/src/builtins/aggregate-error.tq",
17-
"<(V8_ROOT)/src/builtins/array-copywithin.tq",
18-
"<(V8_ROOT)/src/builtins/array-every.tq",
19-
"<(V8_ROOT)/src/builtins/array-filter.tq",
20-
"<(V8_ROOT)/src/builtins/array-find.tq",
21-
"<(V8_ROOT)/src/builtins/array-findindex.tq",
22-
"<(V8_ROOT)/src/builtins/array-foreach.tq",
23-
"<(V8_ROOT)/src/builtins/array-from.tq",
24-
"<(V8_ROOT)/src/builtins/array-isarray.tq",
25-
"<(V8_ROOT)/src/builtins/array-join.tq",
26-
"<(V8_ROOT)/src/builtins/array-lastindexof.tq",
27-
"<(V8_ROOT)/src/builtins/array-map.tq",
28-
"<(V8_ROOT)/src/builtins/array-of.tq",
29-
"<(V8_ROOT)/src/builtins/array-reduce-right.tq",
30-
"<(V8_ROOT)/src/builtins/array-reduce.tq",
31-
"<(V8_ROOT)/src/builtins/array-reverse.tq",
32-
"<(V8_ROOT)/src/builtins/array-shift.tq",
33-
"<(V8_ROOT)/src/builtins/array-slice.tq",
34-
"<(V8_ROOT)/src/builtins/array-some.tq",
35-
"<(V8_ROOT)/src/builtins/array-splice.tq",
36-
"<(V8_ROOT)/src/builtins/array-unshift.tq",
37-
"<(V8_ROOT)/src/builtins/array.tq",
38-
"<(V8_ROOT)/src/builtins/arraybuffer.tq",
39-
"<(V8_ROOT)/src/builtins/base.tq",
40-
"<(V8_ROOT)/src/builtins/bigint.tq",
41-
"<(V8_ROOT)/src/builtins/boolean.tq",
42-
"<(V8_ROOT)/src/builtins/builtins-string.tq",
43-
"<(V8_ROOT)/src/builtins/cast.tq",
44-
"<(V8_ROOT)/src/builtins/collections.tq",
45-
"<(V8_ROOT)/src/builtins/constructor.tq",
46-
"<(V8_ROOT)/src/builtins/conversion.tq",
47-
"<(V8_ROOT)/src/builtins/convert.tq",
48-
"<(V8_ROOT)/src/builtins/console.tq",
49-
"<(V8_ROOT)/src/builtins/data-view.tq",
50-
"<(V8_ROOT)/src/builtins/finalization-registry.tq",
51-
"<(V8_ROOT)/src/builtins/frames.tq",
52-
"<(V8_ROOT)/src/builtins/frame-arguments.tq",
53-
"<(V8_ROOT)/src/builtins/function.tq",
54-
"<(V8_ROOT)/src/builtins/growable-fixed-array.tq",
55-
"<(V8_ROOT)/src/builtins/ic-callable.tq",
56-
"<(V8_ROOT)/src/builtins/ic.tq",
57-
"<(V8_ROOT)/src/builtins/internal-coverage.tq",
58-
"<(V8_ROOT)/src/builtins/internal.tq",
59-
"<(V8_ROOT)/src/builtins/iterator.tq",
60-
"<(V8_ROOT)/src/builtins/math.tq",
61-
"<(V8_ROOT)/src/builtins/number.tq",
62-
"<(V8_ROOT)/src/builtins/object-fromentries.tq",
63-
"<(V8_ROOT)/src/builtins/object.tq",
64-
"<(V8_ROOT)/src/builtins/promise-abstract-operations.tq",
65-
"<(V8_ROOT)/src/builtins/promise-all.tq",
66-
"<(V8_ROOT)/src/builtins/promise-all-element-closure.tq",
67-
"<(V8_ROOT)/src/builtins/promise-any.tq",
68-
"<(V8_ROOT)/src/builtins/promise-constructor.tq",
69-
"<(V8_ROOT)/src/builtins/promise-finally.tq",
70-
"<(V8_ROOT)/src/builtins/promise-misc.tq",
71-
"<(V8_ROOT)/src/builtins/promise-race.tq",
72-
"<(V8_ROOT)/src/builtins/promise-reaction-job.tq",
73-
"<(V8_ROOT)/src/builtins/promise-resolve.tq",
74-
"<(V8_ROOT)/src/builtins/promise-then.tq",
75-
"<(V8_ROOT)/src/builtins/promise-jobs.tq",
76-
"<(V8_ROOT)/src/builtins/proxy-constructor.tq",
77-
"<(V8_ROOT)/src/builtins/proxy-delete-property.tq",
78-
"<(V8_ROOT)/src/builtins/proxy-get-property.tq",
79-
"<(V8_ROOT)/src/builtins/proxy-get-prototype-of.tq",
80-
"<(V8_ROOT)/src/builtins/proxy-has-property.tq",
81-
"<(V8_ROOT)/src/builtins/proxy-is-extensible.tq",
82-
"<(V8_ROOT)/src/builtins/proxy-prevent-extensions.tq",
83-
"<(V8_ROOT)/src/builtins/proxy-revocable.tq",
84-
"<(V8_ROOT)/src/builtins/proxy-revoke.tq",
85-
"<(V8_ROOT)/src/builtins/proxy-set-property.tq",
86-
"<(V8_ROOT)/src/builtins/proxy-set-prototype-of.tq",
87-
"<(V8_ROOT)/src/builtins/proxy.tq",
88-
"<(V8_ROOT)/src/builtins/reflect.tq",
89-
"<(V8_ROOT)/src/builtins/regexp-exec.tq",
90-
"<(V8_ROOT)/src/builtins/regexp-match-all.tq",
91-
"<(V8_ROOT)/src/builtins/regexp-match.tq",
92-
"<(V8_ROOT)/src/builtins/regexp-replace.tq",
93-
"<(V8_ROOT)/src/builtins/regexp-search.tq",
94-
"<(V8_ROOT)/src/builtins/regexp-source.tq",
95-
"<(V8_ROOT)/src/builtins/regexp-split.tq",
96-
"<(V8_ROOT)/src/builtins/regexp-test.tq",
97-
"<(V8_ROOT)/src/builtins/regexp.tq",
98-
"<(V8_ROOT)/src/builtins/string-endswith.tq",
99-
"<(V8_ROOT)/src/builtins/string-html.tq",
100-
"<(V8_ROOT)/src/builtins/string-iterator.tq",
101-
"<(V8_ROOT)/src/builtins/string-pad.tq",
102-
"<(V8_ROOT)/src/builtins/string-repeat.tq",
103-
"<(V8_ROOT)/src/builtins/string-replaceall.tq",
104-
"<(V8_ROOT)/src/builtins/string-slice.tq",
105-
"<(V8_ROOT)/src/builtins/string-startswith.tq",
106-
"<(V8_ROOT)/src/builtins/string-substring.tq",
107-
"<(V8_ROOT)/src/builtins/string-substr.tq",
108-
"<(V8_ROOT)/src/builtins/symbol.tq",
109-
"<(V8_ROOT)/src/builtins/torque-internal.tq",
110-
"<(V8_ROOT)/src/builtins/typed-array-createtypedarray.tq",
111-
"<(V8_ROOT)/src/builtins/typed-array-every.tq",
112-
"<(V8_ROOT)/src/builtins/typed-array-entries.tq",
113-
"<(V8_ROOT)/src/builtins/typed-array-filter.tq",
114-
"<(V8_ROOT)/src/builtins/typed-array-find.tq",
115-
"<(V8_ROOT)/src/builtins/typed-array-findindex.tq",
116-
"<(V8_ROOT)/src/builtins/typed-array-foreach.tq",
117-
"<(V8_ROOT)/src/builtins/typed-array-from.tq",
118-
"<(V8_ROOT)/src/builtins/typed-array-keys.tq",
119-
"<(V8_ROOT)/src/builtins/typed-array-of.tq",
120-
"<(V8_ROOT)/src/builtins/typed-array-reduce.tq",
121-
"<(V8_ROOT)/src/builtins/typed-array-reduceright.tq",
122-
"<(V8_ROOT)/src/builtins/typed-array-set.tq",
123-
"<(V8_ROOT)/src/builtins/typed-array-slice.tq",
124-
"<(V8_ROOT)/src/builtins/typed-array-some.tq",
125-
"<(V8_ROOT)/src/builtins/typed-array-sort.tq",
126-
"<(V8_ROOT)/src/builtins/typed-array-subarray.tq",
127-
"<(V8_ROOT)/src/builtins/typed-array-values.tq",
128-
"<(V8_ROOT)/src/builtins/typed-array.tq",
129-
"<(V8_ROOT)/src/builtins/wasm.tq",
130-
"<(V8_ROOT)/src/builtins/weak-ref.tq",
131-
"<(V8_ROOT)/src/ic/handler-configuration.tq",
132-
"<(V8_ROOT)/src/objects/allocation-site.tq",
133-
"<(V8_ROOT)/src/objects/api-callbacks.tq",
134-
"<(V8_ROOT)/src/objects/arguments.tq",
135-
"<(V8_ROOT)/src/objects/cell.tq",
136-
"<(V8_ROOT)/src/objects/code.tq",
137-
"<(V8_ROOT)/src/objects/contexts.tq",
138-
"<(V8_ROOT)/src/objects/data-handler.tq",
139-
"<(V8_ROOT)/src/objects/debug-objects.tq",
140-
"<(V8_ROOT)/src/objects/descriptor-array.tq",
141-
"<(V8_ROOT)/src/objects/embedder-data-array.tq",
142-
"<(V8_ROOT)/src/objects/feedback-cell.tq",
143-
"<(V8_ROOT)/src/objects/feedback-vector.tq",
144-
"<(V8_ROOT)/src/objects/fixed-array.tq",
145-
"<(V8_ROOT)/src/objects/foreign.tq",
146-
"<(V8_ROOT)/src/objects/free-space.tq",
147-
"<(V8_ROOT)/src/objects/heap-number.tq",
148-
"<(V8_ROOT)/src/objects/heap-object.tq",
149-
"<(V8_ROOT)/src/objects/js-array-buffer.tq",
150-
"<(V8_ROOT)/src/objects/js-array.tq",
151-
"<(V8_ROOT)/src/objects/js-collection-iterator.tq",
152-
"<(V8_ROOT)/src/objects/js-collection.tq",
153-
"<(V8_ROOT)/src/objects/js-generator.tq",
154-
"<(V8_ROOT)/src/objects/js-objects.tq",
155-
"<(V8_ROOT)/src/objects/js-promise.tq",
156-
"<(V8_ROOT)/src/objects/js-proxy.tq",
157-
"<(V8_ROOT)/src/objects/js-regexp-string-iterator.tq",
158-
"<(V8_ROOT)/src/objects/js-regexp.tq",
159-
"<(V8_ROOT)/src/objects/js-weak-refs.tq",
160-
"<(V8_ROOT)/src/objects/literal-objects.tq",
161-
"<(V8_ROOT)/src/objects/map.tq",
162-
"<(V8_ROOT)/src/objects/microtask.tq",
163-
"<(V8_ROOT)/src/objects/module.tq",
164-
"<(V8_ROOT)/src/objects/name.tq",
165-
"<(V8_ROOT)/src/objects/oddball.tq",
166-
"<(V8_ROOT)/src/objects/ordered-hash-table.tq",
167-
"<(V8_ROOT)/src/objects/primitive-heap-object.tq",
168-
"<(V8_ROOT)/src/objects/promise.tq",
169-
"<(V8_ROOT)/src/objects/property-array.tq",
170-
"<(V8_ROOT)/src/objects/property-cell.tq",
171-
"<(V8_ROOT)/src/objects/property-descriptor-object.tq",
172-
"<(V8_ROOT)/src/objects/prototype-info.tq",
173-
"<(V8_ROOT)/src/objects/regexp-match-info.tq",
174-
"<(V8_ROOT)/src/objects/scope-info.tq",
175-
"<(V8_ROOT)/src/objects/script.tq",
176-
"<(V8_ROOT)/src/objects/shared-function-info.tq",
177-
"<(V8_ROOT)/src/objects/source-text-module.tq",
178-
"<(V8_ROOT)/src/objects/stack-frame-info.tq",
179-
"<(V8_ROOT)/src/objects/string.tq",
180-
"<(V8_ROOT)/src/objects/struct.tq",
181-
"<(V8_ROOT)/src/objects/synthetic-module.tq",
182-
"<(V8_ROOT)/src/objects/template-objects.tq",
183-
"<(V8_ROOT)/src/objects/template.tq",
184-
"<(V8_ROOT)/src/wasm/wasm-objects.tq",
185-
"<(V8_ROOT)/test/torque/test-torque.tq",
186-
"<(V8_ROOT)/third_party/v8/builtins/array-sort.tq",
187-
],
188-
'torque_output_root': '<(SHARED_INTERMEDIATE_DIR)/torque-output-root',
189-
'torque_files_replaced': ['<!@pymod_do_main(ForEachReplace ".tq" "-tq-csa" <@(torque_files))'],
190-
'torque_outputs': ['<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/%s.cc" <@(torque_files_replaced))'],
191-
'torque_outputs+': ['<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/%s.h" <@(torque_files_replaced))'],
15+
'torque_files': ['<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "torque_files = ")'],
16+
# Torque and V8 expect the files to be named relative to V8's root.
17+
'torque_files_without_v8_root': ['<!@pymod_do_main(ForEachReplace "<@(V8_ROOT)/" "" <@(torque_files))'],
18+
'torque_files_replaced': ['<!@pymod_do_main(ForEachReplace ".tq" "-tq" <@(torque_files_without_v8_root))'],
19+
'torque_outputs_csa_cc': ['<!@pymod_do_main(ForEachFormat "<(SHARED_INTERMEDIATE_DIR)/torque-generated/%s-csa.cc" <@(torque_files_replaced))'],
20+
'torque_outputs_csa_h': ['<!@pymod_do_main(ForEachFormat "<(SHARED_INTERMEDIATE_DIR)/torque-generated/%s-csa.h" <@(torque_files_replaced))'],
21+
'torque_outputs_inl_inc': ['<!@pymod_do_main(ForEachFormat "<(SHARED_INTERMEDIATE_DIR)/torque-generated/%s-inl.inc" <@(torque_files_replaced))'],
22+
'torque_outputs_cc': ['<!@pymod_do_main(ForEachFormat "<(SHARED_INTERMEDIATE_DIR)/torque-generated/%s.cc" <@(torque_files_replaced))'],
23+
'torque_outputs_inc': ['<!@pymod_do_main(ForEachFormat "<(SHARED_INTERMEDIATE_DIR)/torque-generated/%s.inc" <@(torque_files_replaced))'],
19224
'v8_compiler_sources': ['<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources = ")'],
193-
19425
'conditions': [
19526
['v8_enable_i18n_support', {
19627
'torque_files': [
197-
"<(V8_ROOT)/src/objects/intl-objects.tq",
198-
]
199-
}]
28+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "torque_files \\+= ")',
29+
],
30+
}],
20031
],
20132
},
20233
'includes': ['toolchain.gypi', 'features.gypi'],
@@ -222,7 +53,7 @@
22253
'hard_dependency': 1,
22354
'direct_dependent_settings': {
22455
'include_dirs': [
225-
'<(torque_output_root)',
56+
'<(SHARED_INTERMEDIATE_DIR)',
22657
],
22758
},
22859
'actions': [
@@ -233,35 +64,36 @@
23364
'<@(torque_files)',
23465
],
23566
'outputs': [
236-
'<(torque_output_root)/torque-generated/bit-fields.h',
237-
'<(torque_output_root)/torque-generated/builtin-definitions.h',
238-
'<(torque_output_root)/torque-generated/interface-descriptors.inc',
239-
'<(torque_output_root)/torque-generated/factory.cc',
240-
'<(torque_output_root)/torque-generated/factory.inc',
241-
'<(torque_output_root)/torque-generated/field-offsets.h',
242-
'<(torque_output_root)/torque-generated/class-verifiers.cc',
243-
'<(torque_output_root)/torque-generated/class-verifiers.h',
244-
'<(torque_output_root)/torque-generated/enum-verifiers.cc',
245-
'<(torque_output_root)/torque-generated/objects-printer.cc',
246-
'<(torque_output_root)/torque-generated/objects-body-descriptors-inl.inc',
247-
'<(torque_output_root)/torque-generated/class-definitions.cc',
248-
'<(torque_output_root)/torque-generated/class-definitions-inl.h',
249-
'<(torque_output_root)/torque-generated/class-definitions.h',
250-
'<(torque_output_root)/torque-generated/class-debug-readers.cc',
251-
'<(torque_output_root)/torque-generated/class-debug-readers.h',
252-
'<(torque_output_root)/torque-generated/exported-macros-assembler.cc',
253-
'<(torque_output_root)/torque-generated/exported-macros-assembler.h',
254-
'<(torque_output_root)/torque-generated/csa-types.h',
255-
'<(torque_output_root)/torque-generated/instance-types.h',
256-
'<(torque_output_root)/torque-generated/internal-class-definitions.h',
257-
'<(torque_output_root)/torque-generated/internal-class-definitions-inl.h',
258-
'<(torque_output_root)/torque-generated/exported-class-definitions.h',
259-
'<(torque_output_root)/torque-generated/exported-class-definitions-inl.h',
260-
'<@(torque_outputs)',
67+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/bit-fields.h',
68+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtin-definitions.h',
69+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/interface-descriptors.inc',
70+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/factory.cc',
71+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/factory.inc',
72+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/field-offsets.h',
73+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-verifiers.cc',
74+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-verifiers.h',
75+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/enum-verifiers.cc',
76+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/objects-printer.cc',
77+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/objects-body-descriptors-inl.inc',
78+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-debug-readers.cc',
79+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-debug-readers.h',
80+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/exported-macros-assembler.cc',
81+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/exported-macros-assembler.h',
82+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/csa-types.h',
83+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/instance-types.h',
84+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/runtime-macros.cc',
85+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/runtime-macros.h',
86+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-forward-declarations.h',
87+
'<@(torque_outputs_csa_cc)',
88+
'<@(torque_outputs_csa_h)',
89+
'<@(torque_outputs_inl_inc)',
90+
'<@(torque_outputs_cc)',
91+
'<@(torque_outputs_inc)',
26192
],
26293
'action': [
263-
'<@(_inputs)',
264-
'-o', '<(torque_output_root)/torque-generated',
94+
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
95+
'<@(torque_files_without_v8_root)',
96+
'-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated',
26597
'-v8-root', '<(V8_ROOT)'
26698
],
26799
},
@@ -303,12 +135,13 @@
303135
],
304136
'direct_dependent_settings': {
305137
'sources': [
306-
'<(torque_output_root)/torque-generated/csa-types.h',
307-
'<(torque_output_root)/torque-generated/enum-verifiers.cc',
308-
'<(torque_output_root)/torque-generated/exported-macros-assembler.cc',
309-
'<(torque_output_root)/torque-generated/exported-macros-assembler.h',
138+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/csa-types.h',
139+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/enum-verifiers.cc',
140+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/exported-macros-assembler.cc',
141+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/exported-macros-assembler.h',
310142
'<(V8_ROOT)/src/torque/runtime-support.h',
311-
'<@(torque_outputs)',
143+
'<@(torque_outputs_csa_cc)',
144+
'<@(torque_outputs_csa_h)',
312145
],
313146
}
314147
}, # torque_generated_initializers
@@ -328,14 +161,15 @@
328161
],
329162
'direct_dependent_settings': {
330163
'sources': [
331-
'<(torque_output_root)/torque-generated/class-definitions.cc',
332-
'<(torque_output_root)/torque-generated/class-verifiers.cc',
333-
'<(torque_output_root)/torque-generated/class-verifiers.h',
334-
'<(torque_output_root)/torque-generated/factory.cc',
335-
'<(torque_output_root)/torque-generated/objects-printer.cc',
164+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-forward-declarations.h',
165+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-verifiers.cc',
166+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-verifiers.h',
167+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/factory.cc',
168+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/objects-printer.cc',
169+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/runtime-macros.cc',
336170
],
337171
'include_dirs': [
338-
'<(torque_output_root)',
172+
'<(SHARED_INTERMEDIATE_DIR)',
339173
],
340174
},
341175
}, # torque_generated_definitions
@@ -357,7 +191,7 @@
357191
],
358192
'include_dirs': [
359193
'<(generate_bytecode_output_root)',
360-
'<(torque_output_root)',
194+
'<(SHARED_INTERMEDIATE_DIR)',
361195
],
362196
},
363197
'actions': [
@@ -406,13 +240,11 @@
406240
'torque_generated_initializers',
407241
],
408242
'include_dirs': [
409-
'<(torque_output_root)',
243+
'<(SHARED_INTERMEDIATE_DIR)',
410244
'<(generate_bytecode_output_root)',
411245
],
412246
'sources': [
413247
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_initializers.*?sources = ")',
414-
415-
'<@(torque_outputs)',
416248
],
417249
'conditions': [
418250
['want_separate_host_toolset', {
@@ -753,7 +585,7 @@
753585
'direct_dependent_settings': {
754586
'include_dirs': [
755587
'<(generate_bytecode_output_root)',
756-
'<(torque_output_root)',
588+
'<(SHARED_INTERMEDIATE_DIR)',
757589
],
758590
},
759591
'sources': [
@@ -1678,7 +1510,7 @@
16781510
'dependencies': ['run_torque'],
16791511
'variables': {
16801512
'heapobject_files': [
1681-
'<(torque_output_root)/torque-generated/instance-types.h',
1513+
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/instance-types.h',
16821514
'<(V8_ROOT)/src/objects/allocation-site.h',
16831515
'<(V8_ROOT)/src/objects/allocation-site-inl.h',
16841516
'<(V8_ROOT)/src/objects/cell.h',

0 commit comments

Comments
 (0)