summaryrefslogtreecommitdiff
path: root/src/lib/libssl
diff options
context:
space:
mode:
authorjsing <>2017-04-30 04:44:58 +0000
committerjsing <>2017-04-30 04:44:58 +0000
commit5952ef2f33ac903c4ae6711762df29c1aba6b640 (patch)
tree6dd7e7bcf74c683e17469fe4e4f0086513fbd2ac /src/lib/libssl
parent218193cef9ff51b530e3b4dba5b4fdf95fe01bb3 (diff)
downloadopenbsd-5952ef2f33ac903c4ae6711762df29c1aba6b640.tar.gz
openbsd-5952ef2f33ac903c4ae6711762df29c1aba6b640.tar.bz2
openbsd-5952ef2f33ac903c4ae6711762df29c1aba6b640.zip
Only enable -Werror on libcrypto/libssl/libtls if we are building with
gcc4. This should avoid failed builds while transitioning compilers. While here also make the CFLAGS blocks consistent across makefiles. Discussed with deraadt@, ok beck@
Diffstat (limited to 'src/lib/libssl')
-rw-r--r--src/lib/libssl/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libssl/Makefile b/src/lib/libssl/Makefile
index 12a4b4c2fa..809851d251 100644
--- a/src/lib/libssl/Makefile
+++ b/src/lib/libssl/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.34 2017/04/29 22:31:42 beck Exp $ 1# $OpenBSD: Makefile,v 1.35 2017/04/30 04:44:58 jsing Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.ifndef NOMAN 4.ifndef NOMAN
@@ -12,10 +12,11 @@ CLEANFILES=${PC_FILES} ${VERSION_SCRIPT}
12LIB= ssl 12LIB= ssl
13 13
14CFLAGS+= -Wall -Wundef 14CFLAGS+= -Wall -Wundef
15.if ${COMPILER_VERSION:L} != "gcc3" 15.if ${COMPILER_VERSION:L} == "gcc4"
16CFLAGS+= -Werror 16CFLAGS+= -Werror
17.endif 17.endif
18CFLAGS+= -DLIBRESSL_INTERNAL 18CFLAGS+= -DLIBRESSL_INTERNAL
19
19CFLAGS+= -I${.CURDIR} 20CFLAGS+= -I${.CURDIR}
20 21
21LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto 22LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto