From: miod <miod@openbsd.org>
Date: Sun, 18 May 2014 11:20:08 +0000 (+0000)
Subject: Omit -Werror if building with gcc3, for it triggers "redefinition of `pqueue'"
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4fd2ca8d85a499beb97c7b5995cabda40b8b9db6;p=openbsd

Omit -Werror if building with gcc3, for it triggers "redefinition of `pqueue'"
warnings now that pqueue.h has been removed from public scope.
---

diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile
index d282268f0a0..10f6a5eff04 100644
--- a/lib/libssl/ssl/Makefile
+++ b/lib/libssl/ssl/Makefile
@@ -1,11 +1,15 @@
-# $OpenBSD: Makefile,v 1.43 2014/05/15 19:39:46 miod Exp $
+# $OpenBSD: Makefile,v 1.44 2014/05/18 11:20:08 miod Exp $
 
 LIB=	ssl
 
 SSL_SRC=	${.CURDIR}/../../libssl/src
 LSSL_SRC=	${SSL_SRC}/ssl
 
-CFLAGS+= -Wall -Werror
+.include <bsd.own.mk>
+CFLAGS+= -Wall
+.if ${COMPILER_VERSION:L} != "gcc3"
+CFLAGS+= -Werror
+.endif
 CFLAGS+= -DTERMIOS -DANSI_SOURCE
 CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5
 CFLAGS+= -I${SSL_SRC}