Mercurial > hg > nginx-quic
annotate auto/lib/openssl/makefile.msvc @ 7247:b329c0ab1a48
Configure: restored "no-threads" in OpenSSL builds.
This was previously used, but was incorrectly removed in 83d54192e97b
while removing old threads remnants. Instead of using it conditionally
when threads are not used, we now set in unconditionally, as even with
thread pools enabled we never call OpenSSL functions in threads.
This fixes resulting binary when using --with-openssl with OpenSSL 1.1.0+
and without -lpthread linked (notably on FreeBSD without PCRE).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 22 Mar 2018 15:56:07 +0300 |
parents | abb0a4189cf7 |
children | a423e314c22f |
rev | line source |
---|---|
2846 | 1 |
2 # Copyright (C) Igor Sysoev | |
4412 | 3 # Copyright (C) Nginx, Inc. |
2846 | 4 |
5 | |
6 all: | |
7 cd $(OPENSSL) | |
8 | |
6862
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
9 perl Configure VC-WIN32 no-shared \ |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
10 --prefix="%cd%/openssl" \ |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
11 --openssldir="%cd%/openssl/ssl" \ |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
12 $(OPENSSL_OPT) |
2846 | 13 |
6862
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
14 if exist ms\do_ms.bat ( \ |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
15 ms\do_ms \ |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
16 && $(MAKE) -f ms\nt.mak \ |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
17 && $(MAKE) -f ms\nt.mak install \ |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
18 ) else ( \ |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
19 $(MAKE) \ |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
20 && $(MAKE) install_sw \ |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
21 ) |