deps,v8: cherry-pick dc704497

[refack]

Refs: #19630
Refs: v8/v8@dc70449

Original commit message:

 undef min,max macros on windows This blocks building with official clang-cl and Windows SDK Refs: https://github.com/nodejs/node/issues/19630 Change-Id: I41fdf934f486c660df7a9e0dd284f6eb3c294dd4 Reviewed-on: https://chromium-review.googlesource.com/c/1297479 Commit-Queue: Jakob Gruber <[email protected]> Reviewed-by: Jakob Gruber <[email protected]> Cr-Commit-Position: refs/heads/master@{#57053} 

Checklist

• make -j4 test (UNIX), or vcbuild test (Windows) passes
• commit message follows commit guidelines

[nodejs-github-bot]

@refack build started: https://ci.nodejs.org/blue/organizations/jenkins/node-test-pull-request-lite-pipeline/detail/node-test-pull-request-lite-pipeline/1430/pipeline

[richardlau]

Bump v8_embedder_string in

node/common.gypi

Line 36 in 6f4721b

'v8_embedder_string': '-node.7',

?

FWIW we define NOMINMAX in

node/node.gypi

Line 61 in bf7ed80

'NOMINMAX',

[refack]

FWIW we define NOMINMAX in

node/node.gypi

Line 61 in bf7ed80

'NOMINMAX',

That affects only the targets that node.gypi is included into (i.e. the node binary, and cctest). It is not transitive, and indeed with MSVS's cl.exe I get the warnings:

 stack_trace_win.cc d:\code\node\deps\v8\src\base\macros.h(406): warning C4003: not enough arguments for function-like macro invocation 'min' [D:\code\node\deps\v8\gypfiles\v8_libbase.vcxproj] d:\code\node\deps\v8\src\base\macros.h(408): warning C4003: not enough arguments for function-like macro invocation 'max' [D:\code\node\deps\v8\gypfiles\v8_libbase.vcxproj] d:\code\node\deps\v8\src\base\macros.h(411): warning C4003: not enough arguments for function-like macro invocation 'min' [D:\code\node\deps\v8\gypfiles\v8_libbase.vcxproj] d:\code\node\deps\v8\src\base\macros.h(414): warning C4003: not enough arguments for function-like macro invocation 'max' [D:\code\node\deps\v8\gypfiles\v8_libbase.vcxproj] logging.cc

and when trying to build with clang-cl I get a compilation error.

---

Bump v8_embedder_string in node/common.gypi

Done
https://github.com/nodejs/node/blob/46ddcf1cf0deae6046075ba870942e05ae2034a2/common.gypi#L36

[bnoordhuis]

Doesn't this work?

diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp index f47cf075bb..b97dfb9324 100644 --- a/deps/v8/gypfiles/v8.gyp+++ b/deps/v8/gypfiles/v8.gyp@@ -2139,6 +2139,7 @@ 'libraries': [ '-lwinmm', '-lws2_32' ], }, },{+ 'defines': [ 'NOMINMAX' ], 'sources': [ '../src/base/debug/stack_trace_win.cc', '../src/base/platform/platform-win32.cc',

We can't land this PR as-is because of the 'no out-of-tree patches' policy. You'd have to open an upstream CL first.

Never mind, I somehow missed that this was a cherry-pick.

[refack]

PR CI: https://ci.nodejs.org/job/node-test-pull-request/18307/
V8 CI: https://ci.nodejs.org/job/node-test-commit-v8-linux/1809/