Skip to content

Commit 1c76d80

Browse files
committed
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. Refs: nodejs#23913
1 parent 52c548b commit 1c76d80

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

common.gypi

+6-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
'clang%': 0,
2929

30-
'openssl_no_asm%': 0,
3130
'openssl_fips%': '',
3231

3332
# Reset this number to 0 on major V8 upgrades.
@@ -52,6 +51,12 @@
5251
'icu_use_data_file_flag%': 0,
5352

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

configure.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1175,9 +1175,11 @@ def configure_openssl(o):
11751175
variables = o['variables']
11761176
variables['node_use_openssl'] = b(not options.without_ssl)
11771177
variables['node_shared_openssl'] = b(options.shared_openssl)
1178-
variables['openssl_no_asm'] = 1 if options.openssl_no_asm else 0
11791178
variables['openssl_fips'] = ''
11801179

1180+
if options.openssl_no_asm:
1181+
variables['openssl_no_asm'] = 1
1182+
11811183
if options.without_ssl:
11821184
def without_ssl_error(option):
11831185
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)