summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2012-02-19 04:53:37 +0000
committerguenther <guenther@openbsd.org>2012-02-19 04:53:37 +0000
commit4f0c9400be11e4b9153c31d5efdaa905349be706 (patch)
tree1a65862b0de81b354f6b93fcd5c09465f64ac32f
parentUse a form of designated initializer that works with gcc2 (diff)
downloadwireguard-openbsd-4f0c9400be11e4b9153c31d5efdaa905349be706.tar.xz
wireguard-openbsd-4f0c9400be11e4b9153c31d5efdaa905349be706.zip
Extend miod's fix CFLAGS fix to all gcc2 platforms (suggested by Tobias
Ulmer). Only pull in bsd.lib.mk once to avoid linking objects twice
-rw-r--r--lib/librthread/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/librthread/Makefile b/lib/librthread/Makefile
index 11e0d79eafa..0f9d9811354 100644
--- a/lib/librthread/Makefile
+++ b/lib/librthread/Makefile
@@ -1,4 +1,7 @@
-# $OpenBSD: Makefile,v 1.25 2012/02/18 16:24:02 miod Exp $
+# $OpenBSD: Makefile,v 1.26 2012/02/19 04:53:37 guenther Exp $
+
+# For ``COMPILER_VERSION''
+.include <bsd.own.mk>
LIB=pthread
WANTLINT=
@@ -6,7 +9,7 @@ LINTFLAGS=-z
LIBCSRCDIR= ${.CURDIR}/../libc
CFLAGS+=-Wall -g -Werror -Wshadow
-.if "${MACHINE_ARCH}" != "vax"
+.if ${COMPILER_VERSION:L} == "gcc3" || ${COMPILER_VERSION:L} == "gcc4"
CFLAGS+=-Wmissing-prototypes
.endif
CFLAGS+=-Wstrict-prototypes
@@ -26,7 +29,6 @@ OBJS+= _atomic_lock.o rfork_thread.o cerror.o
MAN+= __tfork_thread.3
MLINKS+=__tfork_thread.3 __tfork.2
-.include <bsd.lib.mk>
SRCDIR= ${.CURDIR}/../libpthread
.include "${SRCDIR}/include/Makefile.inc"