Skip to content

Commit

Permalink
build: re-enable openssl arm for arm64
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: James M Snell <[email protected]>
  • Loading branch information
vielmetti authored and sam-github committed Jul 25, 2019
1 parent 43e5478 commit 16f673e
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
'clang%': 0,

'openssl_fips%': '',
'openssl_no_asm%': 0,

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

'conditions': [
['target_arch=="arm64"', {
# Disabled pending https://github.com/nodejs/node/issues/23913.
'openssl_no_asm%': 1,
}, {
'openssl_no_asm%': 0,
}],
['OS == "win"', {
'os_posix': 0,
'v8_postmortem_support%': 0,
Expand Down

0 comments on commit 16f673e

Please sign in to comment.