From 2145114fc4f04a6a75134ef92bc551a976292150 Mon Sep 17 00:00:00 2001
From: jsg <>
Date: Sun, 7 May 2017 04:18:47 +0000
Subject: Limit -Werror to gcc4 as was done in libcrypto/libssl/libtls to avoid
 failed builds with different compilers.

ok jsing@
---
 src/usr.bin/openssl/Makefile    | 10 +++++++---
 src/usr.sbin/ocspcheck/Makefile | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/usr.bin/openssl/Makefile b/src/usr.bin/openssl/Makefile
index 5ba283c174..c862418768 100644
--- a/src/usr.bin/openssl/Makefile
+++ b/src/usr.bin/openssl/Makefile
@@ -1,11 +1,13 @@
-#	$OpenBSD: Makefile,v 1.7 2016/09/04 18:05:34 beck Exp $
+#	$OpenBSD: Makefile,v 1.8 2017/05/07 04:18:47 jsg Exp $
+
+.include <bsd.own.mk>
 
 PROG=	openssl
 LDADD=	-lssl -lcrypto
 DPADD=	${LIBSSL} ${LIBCRYPTO}
 MAN1=	openssl.1
 
-CFLAGS+= -Wall -Werror
+CFLAGS+= -Wall
 CFLAGS+= -Wformat
 CFLAGS+= -Wformat-security
 CFLAGS+= -Wimplicit
@@ -14,7 +16,9 @@ CFLAGS+= -Wreturn-type
 CFLAGS+= -Wtrigraphs
 CFLAGS+= -Wuninitialized
 CFLAGS+= -Wunused
-
+.if ${COMPILER_VERSION:L} == "gcc4"
+CFLAGS+= -Werror
+.endif
 CFLAGS+= -DLIBRESSL_INTERNAL
 
 SRCS=	apps.c apps_posix.c asn1pars.c ca.c certhash.c ciphers.c crl.c \
diff --git a/src/usr.sbin/ocspcheck/Makefile b/src/usr.sbin/ocspcheck/Makefile
index 79f9d5880b..e055c779ab 100644
--- a/src/usr.sbin/ocspcheck/Makefile
+++ b/src/usr.sbin/ocspcheck/Makefile
@@ -1,4 +1,6 @@
-#	$OpenBSD: Makefile,v 1.2 2017/01/24 09:25:27 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2017/05/07 04:18:47 jsg Exp $
+
+.include <bsd.own.mk>
 
 PROG=	ocspcheck
 MAN=	ocspcheck.8
@@ -6,7 +8,7 @@ MAN=	ocspcheck.8
 LDADD=	-ltls -lssl -lcrypto
 DPADD=	${LIBTLS} ${LIBSSL} ${LIBCRYPTO}
 
-CFLAGS+= -Wall -Werror
+CFLAGS+= -Wall
 CFLAGS+= -Wformat
 CFLAGS+= -Wformat-security
 CFLAGS+= -Wimplicit
@@ -15,7 +17,9 @@ CFLAGS+= -Wshadow
 CFLAGS+= -Wtrigraphs
 CFLAGS+= -Wuninitialized
 CFLAGS+= -Wunused
-
+ .if ${COMPILER_VERSION:L} == "gcc4"
+CFLAGS+= -Werror
+.endif
 CFLAGS+= -DLIBRESSL_INTERNAL
 
 SRCS=	ocspcheck.c http.c
-- 
cgit v1.2.3-55-g6feb