Skip to content

Commit 16f673e

Browse files
vielmettisam-github
authored andcommitted
build: re-enable openssl arm for arm64
In #23913 it looked like arm64 testing was flaky, and as a result a number of changes were made including disabling openssl asm for that architecture. This PR is limited to re-enabling the one change to turn on openssl asm for arm64, in the hopes that either it works now, or that this specific change introduces a reproducible condition. See: #23913 PR-URL: #28180 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 43e5478 commit 16f673e

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

common.gypi

+1-6
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
'clang%': 0,
2929

3030
'openssl_fips%': '',
31+
'openssl_no_asm%': 0,
3132

3233
# Some STL containers (e.g. std::vector) do not preserve ABI compatibility
3334
# between debug and non-debug mode.
@@ -78,12 +79,6 @@
7879
##### end V8 defaults #####
7980

8081
'conditions': [
81-
['target_arch=="arm64"', {
82-
# Disabled pending https://github.com/nodejs/node/issues/23913.
83-
'openssl_no_asm%': 1,
84-
}, {
85-
'openssl_no_asm%': 0,
86-
}],
8782
['OS == "win"', {
8883
'os_posix': 0,
8984
'v8_postmortem_support%': 0,

0 commit comments

Comments
 (0)