diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2018-03-22 15:56:07 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2018-03-22 15:56:07 +0300 |
| commit | 78386faf7ee21ecc17db6e90a226c5bd54526f82 (patch) | |
| tree | 6d86929d8ee2982d4223f48bdaffd657d67ea0c1 /auto | |
| parent | 90ca1071b77b0fbb4373ae052b1242023295513f (diff) | |
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).
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/lib/openssl/make | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make index a6090c6d4..126a23875 100644 --- a/auto/lib/openssl/make +++ b/auto/lib/openssl/make @@ -51,7 +51,7 @@ END $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE cd $OPENSSL \\ && if [ -f Makefile ]; then \$(MAKE) clean; fi \\ - && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\ + && ./config --prefix=$ngx_prefix no-shared no-threads $OPENSSL_OPT \\ && \$(MAKE) \\ && \$(MAKE) install_sw LIBDIR=lib |