Skip to content

Commit d6dae74

Browse files
targosnodejs-github-bot
authored andcommitted
deps: V8: cherry-pick f1c888e7093e
Original commit message: [base] Fix SmartOS build That platform doesn't have `malloc_usable_size`. Refs: nodejs/node-v8#239 Change-Id: I011dd8449d02b27219a32cba00132cd068069f50 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4026402 Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Commit-Queue: Michaël Zasso <mic.besace@gmail.com> Cr-Commit-Position: refs/heads/main@{#84256} Refs: v8/v8@f1c888e PR-URL: #45230 Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> # Conflicts: # common.gypi PR-URL: #45579 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent a624277 commit d6dae74

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.4',
39+
'v8_embedder_string': '-node.5',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/src/base/platform/memory.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#include <malloc.h>
2424
#endif // !V8_OS_DARWIN
2525

26-
#if (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN
26+
#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN
2727
#define V8_HAS_MALLOC_USABLE_SIZE 1
28-
#endif // (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN
28+
#endif // (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN
2929

3030
namespace v8::base {
3131

0 commit comments

Comments
 (0)