From 53f73d1cfe987ef9413b6989ff75eb621801b887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Thu, 29 Sep 2022 06:42:06 +0200 Subject: [PATCH] build: enable V8's trap handler on Windows It can now be compiled with MSVC. PR-URL: https://github.com/nodejs/node/pull/44741 Reviewed-By: Ben Noordhuis Reviewed-By: Jiawen Geng Reviewed-By: James M Snell --- tools/v8_gypfiles/v8.gyp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index 6fc63aa88fb6e6..09e6627b3b1072 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -621,8 +621,7 @@ '<(V8_ROOT)/src/trap-handler/handler-inside-posix.h', ], }], - # TODO(targos): Replace False with OS=="win" if handler-outside-simulator.cc becomes compatible with MSVC. - ['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or False)', { + ['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or OS=="win")', { 'sources': [ '<(V8_ROOT)/src/trap-handler/trap-handler-simulator.h', ], @@ -858,16 +857,14 @@ '<(V8_ROOT)/src/trap-handler/handler-outside-posix.cc', ], }], - # TODO(targos): Replace False with OS=="win" if handler-outside-simulator.cc becomes compatible with MSVC. - ['_toolset=="host" and host_arch=="x64" and False', { + ['_toolset=="host" and host_arch=="x64" and OS=="win"', { 'sources': [ '<(V8_ROOT)/src/trap-handler/handler-inside-win.cc', '<(V8_ROOT)/src/trap-handler/handler-outside-win.cc', ], }], - # TODO(targos): Replace False with OS=="win" if handler-outside-simulator.cc becomes compatible with MSVC. ['_toolset=="host" and host_arch=="x64" and ' - '(host_os=="linux" or host_os=="mac" or False)', { + '(host_os=="linux" or host_os=="mac" or OS=="win")', { 'sources': [ '<(V8_ROOT)/src/trap-handler/handler-outside-simulator.cc', ],