Skip to content

Commit d97ad30

Browse files
committed
tools: disable trap handler for Windows cross-compiler
`handler-outside-simulator.cc` uses inline assembly, which is not supported by MSVC. PR-URL: #40488 Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent e3f8988 commit d97ad30

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

tools/v8_gypfiles/v8.gyp

+6-3
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,8 @@
602602
'<(V8_ROOT)/src/trap-handler/handler-inside-posix.h',
603603
],
604604
}],
605-
['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or OS=="win")', {
605+
# TODO(targos): Replace False with OS=="win" if handler-outside-simulator.cc becomes compatible with MSVC.
606+
['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or False)', {
606607
'sources': [
607608
'<(V8_ROOT)/src/trap-handler/trap-handler-simulator.h',
608609
],
@@ -822,13 +823,15 @@
822823
'<(V8_ROOT)/src/trap-handler/handler-outside-posix.cc',
823824
],
824825
}],
825-
['_toolset=="host" and host_arch=="x64" and OS=="win"', {
826+
# TODO(targos): Replace False with OS=="win" if handler-outside-simulator.cc becomes compatible with MSVC.
827+
['_toolset=="host" and host_arch=="x64" and False', {
826828
'sources': [
827829
'<(V8_ROOT)/src/trap-handler/handler-inside-win.cc',
828830
'<(V8_ROOT)/src/trap-handler/handler-outside-win.cc',
829831
],
830832
}],
831-
['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or OS=="win")', {
833+
# TODO(targos): Replace False with OS=="win" if handler-outside-simulator.cc becomes compatible with MSVC.
834+
['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or False)', {
832835
'sources': [
833836
'<(V8_ROOT)/src/trap-handler/handler-outside-simulator.cc',
834837
],

0 commit comments

Comments
 (0)