Improve make pthread linking mechanism

Signed-off-by: Paul Elliott <paul.elliott@arm.com>
2023-12-11 17:52:03 +00:00 · 2023-12-11 17:52:03 +00:00 · 79dc6dad81
commit 79dc6dad81
parent 40f0ec246e
3 changed files with 3 additions and 3 deletions
--- a/programs/Makefile
+++ b/programs/Makefile
@ -139,7 +139,7 @@ APPS = \
 	x509/req_app \
 # End of APPS

-ifdef PTHREAD
+ifeq ($(THREADING),pthread)
 APPS +=	ssl/ssl_pthread_server
 endif

--- a/tests/Makefile
+++ b/tests/Makefile
@ -58,7 +58,7 @@ DLEXT ?= so
 EXEXT=
 SHARED_SUFFIX=

-ifdef PTHREAD
+ifeq ($(THREADING),pthread)
 LOCAL_LDFLAGS += -lpthread
 endif
 endif
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@ -218,7 +218,7 @@ pre_initialize_variables () {
    done

    # Option to enable linking with pthreads under make
-    MAKE_THREADING_FLAGS="PTHREAD=1"
+    MAKE_THREADING_FLAGS="THREADING=pthread"
 }

 # Test whether the component $1 is included in the command line patterns.