diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2018-11-09 13:55:37 +0300 |
|---|---|---|
| committer | Ruben Bridgewater <ruben@bridgewater.de> | 2018-11-14 02:55:50 +0300 |
| commit | 1c8b4d7c89f41b6781dc4b5a73ba38a7f34bc696 (patch) | |
| tree | b829760ac1ae1a52ea5d8c55a1dd0e40972777b3 | |
| parent | a39493f4aa003b4fcc6f401e8ef2ae95ff8eb9eb (diff) | |
build: disable openssl asm on arm64 for now
There is reason to believe the generated assembly isn't working
correctly so let's disable it for now pending further investigation.
PR-URL: https://github.com/nodejs/node/pull/24270
Refs: https://github.com/nodejs/node/issues/23913
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
| -rw-r--r-- | common.gypi | 6 | ||||
| -rwxr-xr-x | configure.py | 4 | ||||
| -rw-r--r-- | deps/openssl/openssl.gyp | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/common.gypi b/common.gypi index 445a70daed1..4b732704ba2 100644 --- a/common.gypi +++ b/common.gypi @@ -50,6 +50,12 @@ 'icu_use_data_file_flag%': 0, 'conditions': [ + ['target_arch=="arm64"', { + # Disabled pending https://github.com/nodejs/node/issues/23913. + 'openssl_no_asm%': 1, + }, { + 'openssl_no_asm%': 0, + }], ['GENERATOR=="ninja"', { 'obj_dir': '<(PRODUCT_DIR)/obj', 'conditions': [ diff --git a/configure.py b/configure.py index 0df8e12bf3a..065e31fd9ca 100755 --- a/configure.py +++ b/configure.py @@ -1183,9 +1183,11 @@ def configure_openssl(o): variables = o['variables'] variables['node_use_openssl'] = b(not options.without_ssl) variables['node_shared_openssl'] = b(options.shared_openssl) - variables['openssl_no_asm'] = 1 if options.openssl_no_asm else 0 variables['openssl_fips'] = '' + if options.openssl_no_asm: + variables['openssl_no_asm'] = 1 + if options.without_ssl: def without_ssl_error(option): error('--without-ssl is incompatible with %s' % option) diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 6b0770ebbc1..4a6b5568667 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -1,7 +1,4 @@ { - 'variables': { - 'openssl_no_asm%': 0, - }, 'targets': [ { 'target_name': 'openssl', |