Skip to content

Commit e65b930

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 fd9d43d commit e65b930

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
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.30',
39+
'v8_embedder_string': '-node.31',
4040

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

deps/v8/DEPS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ deps = {
121121
}
122122
],
123123
'dep_type': 'cipd',
124-
'condition': 'host_os == "linux" and host_cpu != "s390" and host_cpu != "ppc"',
124+
'condition': 'host_os == "linux" and host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64"',
125125
},
126126
'buildtools/mac': {
127127
'packages': [
@@ -157,7 +157,7 @@ deps = {
157157
}
158158
],
159159
'dep_type': 'cipd',
160-
'condition': '(host_os == "linux" or host_os == "mac" or host_os == "win") and host_cpu != "s390" and host_cpu != "ppc" and host_cpu != "arm64"',
160+
'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")',
161161
},
162162
'test/benchmarks/data':
163163
Var('chromium_url') + '/v8/deps/third_party/benchmarks.git' + '@' + '05d7188267b4560491ff9155c5ee13e207ecd65f',
@@ -262,7 +262,7 @@ deps = {
262262
}
263263
],
264264
'dep_type': 'cipd',
265-
'condition': 'host_cpu != "s390" and host_cpu != "ppc"'
265+
'condition': 'host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64"'
266266
},
267267
'third_party/perfetto':
268268
Var('android_url') + '/platform/external/perfetto.git' + '@' + '0d180f46481a96cbe8340734fa5cdce3bba636c8',

0 commit comments

Comments
 (0)