Skip to content

Commit 1c8b4d7

Browse files
bnoordhuisBridgeAR
authored andcommitted
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: #24270 Refs: #23913 Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent a39493f commit 1c8b4d7

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

common.gypi

+6
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@
5050
'icu_use_data_file_flag%': 0,
5151

5252
'conditions': [
53+
['target_arch=="arm64"', {
54+
# Disabled pending https://github.com/nodejs/node/issues/23913.
55+
'openssl_no_asm%': 1,
56+
}, {
57+
'openssl_no_asm%': 0,
58+
}],
5359
['GENERATOR=="ninja"', {
5460
'obj_dir': '<(PRODUCT_DIR)/obj',
5561
'conditions': [

configure.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1183,9 +1183,11 @@ def configure_openssl(o):
11831183
variables = o['variables']
11841184
variables['node_use_openssl'] = b(not options.without_ssl)
11851185
variables['node_shared_openssl'] = b(options.shared_openssl)
1186-
variables['openssl_no_asm'] = 1 if options.openssl_no_asm else 0
11871186
variables['openssl_fips'] = ''
11881187

1188+
if options.openssl_no_asm:
1189+
variables['openssl_no_asm'] = 1
1190+
11891191
if options.without_ssl:
11901192
def without_ssl_error(option):
11911193
error('--without-ssl is incompatible with %s' % option)

deps/openssl/openssl.gyp

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
{
2-
'variables': {
3-
'openssl_no_asm%': 0,
4-
},
52
'targets': [
63
{
74
'target_name': 'openssl',

0 commit comments

Comments
 (0)