From d6384322b936d181e80c1948d8ee20a647f0408e Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 30 Apr 2017 04:44:58 +0000
Subject: 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@
---
 src/lib/libcrypto/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/lib/libcrypto')

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 9ab1e0349d..13f4ab0de5 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2017/02/28 14:15:37 jsing Exp $
+# $OpenBSD: Makefile,v 1.16 2017/04/30 04:44:58 jsing Exp $
 
 LIB=	crypto
 
@@ -13,13 +13,16 @@ CLEANFILES=${PC_FILES} ${VERSION_SCRIPT}
 
 LCRYPTO_SRC=	${.CURDIR}
 
-CFLAGS+= -Wall -Wundef -Werror
+CFLAGS+= -Wall -Wundef
+.if ${COMPILER_VERSION:L} == "gcc4"
+CFLAGS+= -Werror
+.endif
+CFLAGS+= -DLIBRESSL_INTERNAL
 
 .if !defined(NOPIC)
 CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H -DHAVE_FUNOPEN
 .endif
 
-CFLAGS+= -DLIBRESSL_INTERNAL
 # Hardware engines
 CFLAGS+= -DOPENSSL_NO_HW_PADLOCK # XXX enable this?
 
-- 
cgit v1.2.3-55-g6feb