diff options
| author | Fedor Indutny <fedor@indutny.com> | 2014-09-02 15:53:36 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-09-03 17:35:18 +0400 |
| commit | 627c1a92ebc3be841becd01937aa273bc73ba0a5 (patch) | |
| tree | 6dcaab4f3a01187b394a0af905aa78ab8b2c8d66 | |
| parent | 8e60b4523cc9097aad81e0dbbc6d24617c279e66 (diff) | |
| download | android-node-v8-627c1a92ebc3be841becd01937aa273bc73ba0a5.tar.gz android-node-v8-627c1a92ebc3be841becd01937aa273bc73ba0a5.tar.bz2 android-node-v8-627c1a92ebc3be841becd01937aa273bc73ba0a5.zip | |
configure: add --openssl-no-asm flag
see #8062
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | deps/openssl/openssl.gyp | 3 |
2 files changed, 9 insertions, 1 deletions
@@ -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 diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 5c654c9e1e..5d7880a558 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -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' |