diff options
author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-09-17 04:48:09 +0400 |
---|---|---|
committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-09-17 04:48:09 +0400 |
commit | 7ca5af87a0662a1f8dca2391ae90a6342592302b (patch) | |
tree | 11be3300f5b2a7e81ca6893d768682dbeb114d8b /configure | |
parent | 21e60643b0795fe7b6a46ff29d73df60e6a7c9f5 (diff) | |
parent | 84952da24192da98746573f1086b7f393f423a3c (diff) |
Merge remote-tracking branch 'upstream/v0.10' into v0.12
Conflicts:
ChangeLog
deps/v8/src/hydrogen.cc
lib/http.js
lib/querystring.js
src/node_crypto.cc
src/node_version.h
test/simple/test-querystring.js
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/configure b/configure index cfa5f673804..2e085832546 100755 --- a/configure +++ b/configure @@ -60,6 +60,11 @@ parser.add_option("--fully-static", help="Generate an executable without external dynamic libraries. This " "will not work on OSX when using default compilation environment") +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-includes', action='store', @@ -629,6 +634,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 |