Skip to content

Commit f8d8c1b

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 e7d742a commit f8d8c1b

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.33',
41+
'v8_embedder_string': '-node.34',
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
@@ -139,7 +139,7 @@ deps = {
139139
}
140140
],
141141
'dep_type': 'cipd',
142-
'condition': 'host_os == "linux" and host_cpu != "s390" and host_cpu != "ppc"',
142+
'condition': 'host_os == "linux" and host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64"',
143143
},
144144
'buildtools/mac': {
145145
'packages': [
@@ -169,7 +169,7 @@ deps = {
169169
}
170170
],
171171
'dep_type': 'cipd',
172-
'condition': '(host_os == "linux" or host_os == "mac" or host_os == "win") and host_cpu != "s390" and host_cpu != "ppc" and (host_cpu != "arm64" or host_os == "mac")',
172+
'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")',
173173
},
174174
'test/benchmarks/data':
175175
Var('chromium_url') + '/v8/deps/third_party/benchmarks.git' + '@' + '05d7188267b4560491ff9155c5ee13e207ecd65f',
@@ -315,7 +315,7 @@ deps = {
315315
}
316316
],
317317
'dep_type': 'cipd',
318-
'condition': 'host_cpu != "s390" and host_cpu != "ppc"'
318+
'condition': 'host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64"'
319319
},
320320
'third_party/perfetto':
321321
Var('android_url') + '/platform/external/perfetto.git' + '@' + '6fc824d618d2f06b5d9cd8655ba0419b6b3b366e',
@@ -335,7 +335,7 @@ deps = {
335335
}
336336
],
337337
'dep_type': 'cipd',
338-
'condition': 'not build_with_chromium and host_cpu != "s390" and host_cpu != "ppc"',
338+
'condition': 'not build_with_chromium and host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64"',
339339
},
340340
'third_party/zlib':
341341
Var('chromium_url') + '/chromium/src/third_party/zlib.git'+ '@' + 'c5bf1b566e5df14e763507e2ce30cbfebefeeccf',

0 commit comments

Comments
 (0)