Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
configure: add --openssl-no-asm flag
Browse files Browse the repository at this point in the history
see #8062

Reviewed-By: Trevor Norris <trev.norris@gmail.com>
  • Loading branch information
indutny committed Sep 3, 2014
1 parent 8e60b45 commit 627c1a9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
7 changes: 7 additions & 0 deletions configure
Expand Up @@ -82,6 +82,11 @@ parser.add_option("--shared-openssl-libname",
dest="shared_openssl_libname",
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
parser.add_option("--openssl-use-sys",
action="store_true",
Expand Down Expand Up @@ -609,6 +614,8 @@ def configure_v8(o):
def configure_openssl(o):
o['variables']['node_use_openssl'] = b(not options.without_ssl)
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:
return
Expand Down
3 changes: 2 additions & 1 deletion deps/openssl/openssl.gyp
Expand Up @@ -6,6 +6,7 @@
'variables': {
'is_clang': 0,
'gcc_version': 0,
'openssl_no_asm%': 0
},

'targets': [
Expand Down Expand Up @@ -651,7 +652,7 @@
['exclude', 'store/.*$']
],
'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
'defines': [
'OPENSSL_NO_ASM'
Expand Down

0 comments on commit 627c1a9

Please sign in to comment.