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: nodejs#24270 Refs: nodejs#23913 Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: James M Snell <[email protected]>
kiyomizumia · Nov 15, 2018 · 6f512bf · 6f512bf
1 parent b9a11d1
commit 6f512bf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/common.gypi b/common.gypi
@@ -27,7 +27,6 @@
 
     'clang%': 0,
 
-    'openssl_no_asm%': 0,
     'openssl_fips%': '',
 
     # Reset this number to 0 on major V8 upgrades.
@@ -52,6 +51,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
@@ -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
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'openssl_no_asm%': 0,
-  },
   'targets': [
     {
       'target_name': 'openssl',