From 79f8829eee2dc7ce0238fc92164da407cd8664dd Mon Sep 17 00:00:00 2001 From: bcook <> Date: Mon, 19 Sep 2016 03:25:22 +0000 Subject: Update ld search path for libssl/libcrypto, fixes cross-build after source moved. from Patrick Wildt --- src/lib/libssl/Makefile | 6 +++--- src/lib/libtls/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libssl/Makefile b/src/lib/libssl/Makefile index 4a5c140ed1..6421aabe34 100644 --- a/src/lib/libssl/Makefile +++ b/src/lib/libssl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2016/09/14 06:26:03 natano Exp $ +# $OpenBSD: Makefile,v 1.23 2016/09/19 03:25:22 bcook Exp $ SUBDIR= man PC_FILES=openssl.pc libssl.pc @@ -15,7 +15,7 @@ CFLAGS+= -Werror CFLAGS+= -DLIBRESSL_INTERNAL CFLAGS+= -I${.CURDIR} -LDADD+= -L${BSDOBJDIR}/lib/libcrypto/crypto -lcrypto +LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto SRCS=\ s3_srvr.c s3_clnt.c s3_lib.c s3_pkt.c s3_both.c \ @@ -31,7 +31,7 @@ SRCS=\ SRCS+= s3_cbc.c SRCS+= bs_ber.c bs_cbb.c bs_cbs.c -HDRS= srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h +HDRS= srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h .PATH: ${.CURDIR} diff --git a/src/lib/libtls/Makefile b/src/lib/libtls/Makefile index 356c6f5b2e..245b1def6e 100644 --- a/src/lib/libtls/Makefile +++ b/src/lib/libtls/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2016/09/04 12:26:43 bcook Exp $ +# $OpenBSD: Makefile,v 1.25 2016/09/19 03:25:22 bcook Exp $ CFLAGS+= -Wall -Werror -Wimplicit CFLAGS+= -DLIBRESSL_INTERNAL @@ -7,8 +7,8 @@ LIB= tls DPADD= ${LIBCRYPTO} ${LIBSSL} -LDADD+= -L${BSDOBJDIR}/lib/libcrypto/crypto -lcrypto -LDADD+= -L${BSDOBJDIR}/lib/libssl/ssl -lssl +LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto +LDADD+= -L${BSDOBJDIR}/lib/libssl -lssl HDRS= tls.h -- cgit v1.2.3-55-g6feb