Skip to content

Commit

Permalink
Updated OpenSSL used for win32 builds.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mdounin committed Aug 17, 2015
1 parent 84b0ad6 commit 07d7ecb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions misc/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit 07d7ecb

Please sign in to comment.