summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2022-06-02 11:48:37 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2022-06-02 11:48:37 +0000
commit396d4441e2b0f93f25b4780a3f1c330694561724 (patch)
treed2b717e45b805fd319b3d2bd1f1028bb5a2d7d4b
parent53e083b7dc364d6532a0f78e94e2087c282f3906 (diff)
Only constraints and verify need static linking in here.
-rw-r--r--regress/lib/libcrypto/x509/Makefile10
-rw-r--r--regress/lib/libcrypto/x509/rfc3779/Makefile4
2 files changed, 9 insertions, 5 deletions
diff --git a/regress/lib/libcrypto/x509/Makefile b/regress/lib/libcrypto/x509/Makefile
index 9981858eb7c..1c87ca87faf 100644
--- a/regress/lib/libcrypto/x509/Makefile
+++ b/regress/lib/libcrypto/x509/Makefile
@@ -1,8 +1,12 @@
-# $OpenBSD: Makefile,v 1.10 2021/12/24 03:01:23 tb Exp $
+# $OpenBSD: Makefile,v 1.11 2022/06/02 11:48:36 tb Exp $
PROGS = constraints verify x509attribute x509name x509req_ext callback
-LDADD= -Wl,-Bstatic -lcrypto -Wl,-Bdynamic
-DPADD= ${LIBCRYPTO}
+LDADD = -lcrypto
+DPADD = ${LIBCRYPTO}
+
+LDADD_constraints = ${CRYPTO_INT}
+LDADD_verify = ${CRYPTO_INT}
+
WARNINGS= Yes
CFLAGS+= -DLIBRESSL_INTERNAL -Wall -Werror -I$(BSDSRCDIR)/lib/libcrypto/x509
diff --git a/regress/lib/libcrypto/x509/rfc3779/Makefile b/regress/lib/libcrypto/x509/rfc3779/Makefile
index b876f626d43..b0fc4dc6830 100644
--- a/regress/lib/libcrypto/x509/rfc3779/Makefile
+++ b/regress/lib/libcrypto/x509/rfc3779/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2022/01/07 17:17:02 tb Exp $
+# $OpenBSD: Makefile,v 1.6 2022/06/02 11:48:36 tb Exp $
.include "../../Makefile.inc"
PROG= rfc3779
-LDADD= ${CRYPTO_INT}
+LDADD= -lcrypto
DPADD= ${LIBCRYPTO}
WARNINGS= Yes
CFLAGS+= -DLIBRESSL_CRYPTO_INTERNAL -DLIBRESSL_INTERNAL -Werror