Skip to content

Commit 4d1e094

Browse files
committed
tools: update V8 gypfiles for 9.6
1 parent 9f098fd commit 4d1e094

File tree

1 file changed

+35
-11
lines changed

1 file changed

+35
-11
lines changed

tools/v8_gypfiles/v8.gyp

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -639,14 +639,23 @@
639639
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"arm64\\".*?v8_control_flow_integrity.*?sources \\+= ")',
640640
],
641641
}],
642-
['v8_enable_webassembly==1 and OS=="mac"', {
643-
'sources': [
644-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"arm64\\".*?v8_enable_webassembly.*?is_mac.*?sources \\+= ")',
642+
['v8_enable_webassembly==1', {
643+
'conditions': [
644+
['OS == "mac" or (_toolset == "host" and host_arch == "x64" and OS == "linux")', {
645+
'sources': [
646+
'<(V8_ROOT)/src/trap-handler/handler-inside-posix.h',
647+
],
648+
}],
649+
['_toolset == "host" and host_arch == "x64" and (OS == "linux" or OS == "mac" or OS == "win")', {
650+
'sources': [
651+
'<(V8_ROOT)/src/trap-handler/trap-handler-simulator.h',
652+
],
653+
}],
645654
],
646655
}],
647-
['OS=="win"', {
656+
['OS == "win"', {
648657
'sources': [
649-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"arm64\\".*?is_win.*?sources \\+= ")',
658+
'<(V8_ROOT)/src/diagnostics/unwinding-info-win64.h',
650659
],
651660
}],
652661
],
@@ -857,15 +866,30 @@
857866
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"arm64\\".*?sources \\+= ")',
858867
],
859868
'conditions': [
860-
['OS=="mac"', {
861-
'sources': [
862-
"<(V8_ROOT)/src/trap-handler/handler-inside-posix.cc",
863-
"<(V8_ROOT)/src/trap-handler/handler-outside-posix.cc",
869+
['v8_enable_webassembly==1', {
870+
'conditions': [
871+
['OS == "mac" or (_toolset == "host" and host_arch == "x64" and OS == "linux")', {
872+
'sources': [
873+
'<(V8_ROOT)/src/trap-handler/handler-inside-posix.cc',
874+
'<(V8_ROOT)/src/trap-handler/handler-outside-posix.cc',
875+
],
876+
}],
877+
['_toolset == "host" and host_arch == "x64" and OS == "win"', {
878+
'sources': [
879+
'<(V8_ROOT)/src/trap-handler/handler-inside-win.cc',
880+
'<(V8_ROOT)/src/trap-handler/handler-outside-win.cc',
881+
],
882+
}],
883+
['_toolset == "host" and host_arch == "x64" and (OS == "linux" or OS == "mac" or OS == "win")', {
884+
'sources': [
885+
'<(V8_ROOT)/src/trap-handler/handler-outside-simulator.cc',
886+
],
887+
}],
864888
],
865889
}],
866-
['OS=="win"', {
890+
['OS == "win"', {
867891
'sources': [
868-
"<(V8_ROOT)/src/diagnostics/unwinding-info-win64.cc",
892+
'<(V8_ROOT)/src/diagnostics/unwinding-info-win64.cc',
869893
],
870894
}],
871895
],

0 commit comments

Comments
 (0)