diff options
author | bcook <> | 2016-09-19 03:25:22 +0000 |
---|---|---|
committer | bcook <> | 2016-09-19 03:25:22 +0000 |
commit | 79f8829eee2dc7ce0238fc92164da407cd8664dd (patch) | |
tree | 89b47cf08a8192650a651e8a4171781b8235871c /src | |
parent | 954651ec0690b52e6e2152aefa44f60d5d104d89 (diff) | |
download | openbsd-79f8829eee2dc7ce0238fc92164da407cd8664dd.tar.gz openbsd-79f8829eee2dc7ce0238fc92164da407cd8664dd.tar.bz2 openbsd-79f8829eee2dc7ce0238fc92164da407cd8664dd.zip |
Update ld search path for libssl/libcrypto, fixes cross-build after source moved.
from Patrick Wildt
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/Makefile | 6 | ||||
-rw-r--r-- | src/lib/libtls/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
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 @@ | |||
1 | # $OpenBSD: Makefile,v 1.22 2016/09/14 06:26:03 natano Exp $ | 1 | # $OpenBSD: Makefile,v 1.23 2016/09/19 03:25:22 bcook Exp $ |
2 | 2 | ||
3 | SUBDIR= man | 3 | SUBDIR= man |
4 | PC_FILES=openssl.pc libssl.pc | 4 | PC_FILES=openssl.pc libssl.pc |
@@ -15,7 +15,7 @@ CFLAGS+= -Werror | |||
15 | CFLAGS+= -DLIBRESSL_INTERNAL | 15 | CFLAGS+= -DLIBRESSL_INTERNAL |
16 | CFLAGS+= -I${.CURDIR} | 16 | CFLAGS+= -I${.CURDIR} |
17 | 17 | ||
18 | LDADD+= -L${BSDOBJDIR}/lib/libcrypto/crypto -lcrypto | 18 | LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto |
19 | 19 | ||
20 | SRCS=\ | 20 | SRCS=\ |
21 | s3_srvr.c s3_clnt.c s3_lib.c s3_pkt.c s3_both.c \ | 21 | s3_srvr.c s3_clnt.c s3_lib.c s3_pkt.c s3_both.c \ |
@@ -31,7 +31,7 @@ SRCS=\ | |||
31 | SRCS+= s3_cbc.c | 31 | SRCS+= s3_cbc.c |
32 | SRCS+= bs_ber.c bs_cbb.c bs_cbs.c | 32 | SRCS+= bs_ber.c bs_cbb.c bs_cbs.c |
33 | 33 | ||
34 | HDRS= srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h | 34 | HDRS= srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h |
35 | 35 | ||
36 | .PATH: ${.CURDIR} | 36 | .PATH: ${.CURDIR} |
37 | 37 | ||
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 @@ | |||
1 | # $OpenBSD: Makefile,v 1.24 2016/09/04 12:26:43 bcook Exp $ | 1 | # $OpenBSD: Makefile,v 1.25 2016/09/19 03:25:22 bcook Exp $ |
2 | 2 | ||
3 | CFLAGS+= -Wall -Werror -Wimplicit | 3 | CFLAGS+= -Wall -Werror -Wimplicit |
4 | CFLAGS+= -DLIBRESSL_INTERNAL | 4 | CFLAGS+= -DLIBRESSL_INTERNAL |
@@ -7,8 +7,8 @@ LIB= tls | |||
7 | 7 | ||
8 | DPADD= ${LIBCRYPTO} ${LIBSSL} | 8 | DPADD= ${LIBCRYPTO} ${LIBSSL} |
9 | 9 | ||
10 | LDADD+= -L${BSDOBJDIR}/lib/libcrypto/crypto -lcrypto | 10 | LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto |
11 | LDADD+= -L${BSDOBJDIR}/lib/libssl/ssl -lssl | 11 | LDADD+= -L${BSDOBJDIR}/lib/libssl -lssl |
12 | 12 | ||
13 | HDRS= tls.h | 13 | HDRS= tls.h |
14 | 14 | ||