Skip to content

Commit e8dd189

Browse files
ziyao233RafaelGSS
authored andcommitted
tools: compile maglev files into v8_compiler if maglev is disabled
v8_compiler needs maglev graph builder even if maglev is disabled. But the required files shouldn't be compiled into v8_internal_headers, which both v8_base_without_compiler and v8_compiler depends on, causing duplicate symbols during linking if maglev is disabled or not available for the target. Let's move the files into v8_compiler target where they are used. Fixes: #58954 PR-URL: #58861 Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]>
1 parent 87f4d07 commit e8dd189

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tools/v8_gypfiles/v8.gyp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -637,11 +637,6 @@
637637
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?sources = ")',
638638
],
639639
'conditions': [
640-
['v8_enable_maglev==0', {
641-
'sources': [
642-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?!v8_enable_maglev.*?sources \\+= ")',
643-
],
644-
}],
645640
['v8_enable_snapshot_compression==1', {
646641
'sources': [
647642
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_snapshot_compression.*?sources \\+= ")',
@@ -957,6 +952,11 @@
957952
'abseil.gyp:abseil',
958953
],
959954
'conditions': [
955+
['v8_enable_maglev==0', {
956+
'sources': [
957+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?!v8_enable_maglev.*?sources \\+= ")',
958+
],
959+
}],
960960
['v8_enable_turbofan==1', {
961961
'dependencies': ['v8_compiler_sources'],
962962
}, {

0 commit comments

Comments
 (0)