Updated OpenSSL used for win32 builds.

Note that as of OpenSSL 1.0.0, the "ms\do_ms" script (previously documented
to be used if one doesn't want to use the assembly language files) tries to
use MASM.  Additionally, OpenSSL 1.0.2 finally broke MASM support.  To fix
this, we now explicitly use "no-asm" in OpenSSL options.
This commit is contained in:
Maxim Dounin 2015-08-17 18:09:20 +03:00
parent 06a54b3a61
commit e37a514ae4
1 changed files with 2 additions and 2 deletions

View File

@ -5,7 +5,7 @@ NGINX = nginx-$(VER)
TEMP = tmp
OBJS = objs.msvc8
OPENSSL = openssl-1.0.1p
OPENSSL = openssl-1.0.2d
ZLIB = zlib-1.2.8
PCRE = pcre-8.37
@ -82,7 +82,7 @@ win32:
--with-mail \
--with-stream \
--with-openssl=$(OBJS)/lib/$(OPENSSL) \
--with-openssl-opt=enable-tlsext \
--with-openssl-opt=no-asm \
--with-http_ssl_module \
--with-mail_ssl_module \
--with-stream_ssl_module \