From b4d1cd57b7573c959c66fb47dcc11779b5fb8fee Mon Sep 17 00:00:00 2001 From: Edward Vielmetti Date: Tue, 11 Jun 2019 14:38:25 -0400 Subject: [PATCH] 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: https://github.com/nodejs/node/pull/23913 PR-URL: https://github.com/nodejs/node/pull/28180 Reviewed-By: Rod Vagg Reviewed-By: Sam Roberts Reviewed-By: Richard Lau Reviewed-By: James M Snell --- common.gypi | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/common.gypi b/common.gypi index 1eadd779a34427..634909c1ad458d 100644 --- a/common.gypi +++ b/common.gypi @@ -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. @@ -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,