From 78386faf7ee21ecc17db6e90a226c5bd54526f82 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Thu, 22 Mar 2018 15:56:07 +0300 Subject: 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). --- auto/lib/openssl/make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit