mirrors/nodejs
mirrors/nodejs
0
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2024-11-21 21:19:50 +01:00
Code Issues Releases Activity

configure: add --openssl-no-asm flag

Browse Source 
see #8062

Reviewed-By: Trevor Norris <trev.norris@gmail.com>
This commit is contained in:
Fedor Indutny 2014-09-02 15:53:36 +04:00
parent 8e60b4523c
commit 627c1a92eb
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -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",
@ -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

3
deps/openssl/openssl.gyp vendored
View File

@ -6,6 +6,7 @@
'variables': {
'is_clang': 0,
'gcc_version': 0,
'openssl_no_asm%': 0
},
'targets': [
@ -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'