Browse Source

configure: add --openssl-no-asm flag

see #8062

Reviewed-By: Trevor Norris <trev.norris@gmail.com>
v0.10.32-release
Fedor Indutny 10 years ago
parent
commit
627c1a92eb
  1. 7
      configure
  2. 3
      deps/openssl/openssl.gyp

7
configure

@ -82,6 +82,11 @@ parser.add_option("--shared-openssl-libname",
dest="shared_openssl_libname", dest="shared_openssl_libname",
help="Alternative lib name to link to (default: 'crypto,ssl')") help="Alternative lib name to link to (default: 'crypto,ssl')")
parser.add_option("--openssl-no-asm",
action="store_true",
dest="openssl_no_asm",
help="Do not build optimized assembly for OpenSSL")
# deprecated # deprecated
parser.add_option("--openssl-use-sys", parser.add_option("--openssl-use-sys",
action="store_true", action="store_true",
@ -609,6 +614,8 @@ def configure_v8(o):
def configure_openssl(o): def configure_openssl(o):
o['variables']['node_use_openssl'] = b(not options.without_ssl) o['variables']['node_use_openssl'] = b(not options.without_ssl)
o['variables']['node_shared_openssl'] = b(options.shared_openssl) o['variables']['node_shared_openssl'] = b(options.shared_openssl)
o['variables']['openssl_no_asm'] = (
1 if options.openssl_no_asm else 0)
if options.without_ssl: if options.without_ssl:
return return

3
deps/openssl/openssl.gyp

@ -6,6 +6,7 @@
'variables': { 'variables': {
'is_clang': 0, 'is_clang': 0,
'gcc_version': 0, 'gcc_version': 0,
'openssl_no_asm%': 0
}, },
'targets': [ 'targets': [
@ -651,7 +652,7 @@
['exclude', 'store/.*$'] ['exclude', 'store/.*$']
], ],
'conditions': [ 'conditions': [
['target_arch!="ia32" and target_arch!="x64" and target_arch!="arm"', { ['target_arch!="ia32" and target_arch!="x64" and target_arch!="arm" or openssl_no_asm!=0', {
# Disable asm # Disable asm
'defines': [ 'defines': [
'OPENSSL_NO_ASM' 'OPENSSL_NO_ASM'

Loading…
Cancel
Save