From: Matt Caswell <matt@openssl.org>
Date: Mon, 3 Jul 2023 13:44:46 +0000 (+0100)
Subject: Fix no-thread-pool building
X-Git-Tag: openssl-3.2.0-alpha1~498
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4890f1f75231aaf83e51c44342317fbad678b6c4;p=thirdparty%2Fopenssl.git

Fix no-thread-pool building

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21332)
---

diff --git a/crypto/thread/build.info b/crypto/thread/build.info
index 8b9cc54af38..191e25e20d3 100644
--- a/crypto/thread/build.info
+++ b/crypto/thread/build.info
@@ -1,17 +1,19 @@
 LIBS=../../libcrypto
 
-IF[{- !$disabled{'thread-pool'} -}]
-  $THREADS_ARCH=\
-        arch.c  \
-        arch/thread_win.c arch/thread_posix.c arch/thread_none.c
-
-  $THREADS=\
-        api.c internal.c $THREADS_ARCH
+$THREADS_ARCH=\
+      arch.c  \
+      arch/thread_win.c arch/thread_posix.c arch/thread_none.c
 
+IF[{- !$disabled{'thread-pool'} -}]
   IF[{- !$disabled{quic} -}]
     SHARED_SOURCE[../../libssl]=$THREADS_ARCH
   ENDIF
+  $THREADS=\
+        api.c internal.c $THREADS_ARCH
 ELSE
+  IF[{- !$disabled{quic} -}]
+    SOURCE[../../libssl]=$THREADS_ARCH
+  ENDIF
   $THREADS=api.c
 ENDIF