deps,v8: cherry-pick dc704497 #23985
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nodejs-github-bot
added
the
v8 engine
refack
added
windows
refack
force-pushed
the
cherry-pick-v8-dc704497
branch
from
a522112
to
46ddcf1
Compare
That affects only the targets that 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.ccand when trying to build with
|
richardlau
approved these changes
Oct 31, 2018
|
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',
Never mind, I somehow missed that this was a cherry-pick. |
bnoordhuis
approved these changes
Oct 31, 2018
cjihrig
approved these changes
Oct 31, 2018
Original commit message: undef min,max macros on windows This blocks building with official clang-cl and Windows SDK Refs: nodejs#19630 Change-Id: I41fdf934f486c660df7a9e0dd284f6eb3c294dd4 Reviewed-on: https://chromium-review.googlesource.com/c/1297479 Commit-Queue: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Cr-Commit-Position: refs/heads/master@{#57053} PR-URL: nodejs#23985 Refs: v8/v8@dc70449 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
refack
force-pushed
the
cherry-pick-v8-dc704497
branch
from
46ddcf1
to
d24756b
Compare
targos
pushed a commit
that referenced
this pull request
Nov 3, 2018
Original commit message: undef min,max macros on windows This blocks building with official clang-cl and Windows SDK Refs: #19630 Change-Id: I41fdf934f486c660df7a9e0dd284f6eb3c294dd4 Reviewed-on: https://chromium-review.googlesource.com/c/1297479 Commit-Queue: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Cr-Commit-Position: refs/heads/master@{#57053} PR-URL: #23985 Refs: v8/v8@dc70449 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This was referenced Nov 15, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refs: #19630
Refs: v8/v8@dc70449
Original commit message:
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes