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@

1 files changed, 5 insertions, 2 deletions

diff --git a/src/lib/libtls/Makefile b/src/lib/libtls/Makefile
index d528ddf5ee..2b09517fbe 100644
--- a/src/lib/libtls/Makefile
+++ b/src/lib/libtls/Makefile
@@ -1,11 +1,14 @@
-#       $OpenBSD: Makefile,v 1.30 2017/01/25 23:53:18 schwarze Exp $
+#       $OpenBSD: Makefile,v 1.31 2017/04/30 04:44:58 jsing Exp $
 
 .include <bsd.own.mk>
 .ifndef NOMAN
 SUBDIR= man
 .endif
 
-CFLAGS+= -Wall -Werror -Wimplicit
+CFLAGS+= -Wall -Wimplicit -Wundef
+.if ${COMPILER_VERSION:L} == "gcc4"
+CFLAGS+= -Werror
+.endif
 CFLAGS+= -DLIBRESSL_INTERNAL
 
 CLEANFILES= ${VERSION_SCRIPT}