summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2023-07-03 15:44:46 +0200
committerPauli <pauli@openssl.org>2023-07-06 04:55:21 +0200
commit4890f1f75231aaf83e51c44342317fbad678b6c4 (patch)
tree6c2a95c074a02c739e21b3ecd7ab3ba748d4c362
parentSkip the QUIC ssltrace test under certain config options (diff)
downloadopenssl-4890f1f75231aaf83e51c44342317fbad678b6c4.tar.xz
openssl-4890f1f75231aaf83e51c44342317fbad678b6c4.zip
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)
-rw-r--r--crypto/thread/build.info16
1 files changed, 9 insertions, 7 deletions
diff --git a/crypto/thread/build.info b/crypto/thread/build.info
index 8b9cc54af3..191e25e20d 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