Skip to content

Commit 5316b58

Browse files
targosrichardlau
authored andcommitted
deps: V8: backport 2e4c5cf9b112
Original commit message: remove ppc and s390 from the host_arch list We only support ppc64 and s390x. Same changes is applied to depot_tools: http://crrev.com/c/7100932 Change-Id: I1e4b660a1e46d1c609189301e8fd977fb7434748 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/7102361 Reviewed-by: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Milad Farazmand <mfarazma@ibm.com> Reviewed-by: Thibaud Michaud <thibaudm@chromium.org> Cr-Commit-Position: refs/heads/main@{#103488} Refs: v8/v8@2e4c5cf Fixes: nodejs/build#4184 Co-authored-by: Michaël Zasso <targos@protonmail.com> PR-URL: #60654 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Richard Lau <richard.lau@ibm.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Stewart X Addison <sxa@redhat.com>
1 parent 9ca46de commit 5316b58

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.13',
41+
'v8_embedder_string': '-node.14',
4242

4343
##### V8 defaults for Node.js #####
4444

deps/v8/DEPS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ deps = {
141141
}
142142
],
143143
'dep_type': 'cipd',
144-
'condition': 'host_os == "linux" and host_cpu != "s390" and host_os != "zos" and host_cpu != "ppc"',
144+
'condition': 'host_os == "linux" and host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64"',
145145
},
146146
'buildtools/mac': {
147147
'packages': [
@@ -171,7 +171,7 @@ deps = {
171171
}
172172
],
173173
'dep_type': 'cipd',
174-
'condition': '(host_os == "linux" or host_os == "mac" or host_os == "win") and host_cpu != "s390" and host_os != "zos" and host_cpu != "ppc" and (host_cpu != "arm64" or host_os == "mac")',
174+
'condition': '(host_os == "linux" or host_os == "mac" or host_os == "win") and host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64" and (host_cpu != "arm64" or host_os == "mac")',
175175
},
176176
'test/benchmarks/data':
177177
Var('chromium_url') + '/v8/deps/third_party/benchmarks.git' + '@' + '05d7188267b4560491ff9155c5ee13e207ecd65f',
@@ -481,7 +481,7 @@ deps = {
481481
}
482482
],
483483
'dep_type': 'cipd',
484-
'condition': 'host_cpu != "s390" and host_os != "zos" and host_cpu != "ppc"'
484+
'condition': 'host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64"'
485485
},
486486
'third_party/partition_alloc': {
487487
'url': Var('chromium_url') + '/chromium/src/base/allocator/partition_allocator.git@' + Var('partition_alloc_version'),
@@ -545,7 +545,7 @@ deps = {
545545
}
546546
],
547547
'dep_type': 'cipd',
548-
'condition': 'not build_with_chromium and host_cpu != "s390" and host_os != "zos" and host_cpu != "ppc"',
548+
'condition': 'not build_with_chromium and host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64"',
549549
},
550550
'third_party/zlib':
551551
Var('chromium_url') + '/chromium/src/third_party/zlib.git'+ '@' + 'caf4afa1afc92e16fef429f182444bed98a46a6c',

0 commit comments

Comments
 (0)