summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormortimer <mortimer@openbsd.org>2017-08-10 16:06:59 +0000
committermortimer <mortimer@openbsd.org>2017-08-10 16:06:59 +0000
commitd1a07a2c7c17c100b8e11119272ff8982145bebc (patch)
treed124d4fe1ca4a5ceb7dfc3d98146c4044a4e7a90
parentautodetect AF when setting inet6 default route (diff)
downloadwireguard-openbsd-d1a07a2c7c17c100b8e11119272ff8982145bebc.tar.xz
wireguard-openbsd-d1a07a2c7c17c100b8e11119272ff8982145bebc.zip
Unlink libobjc. It is not used in base, and ports are pulling in libobjc2 from ports.
ok bluhm@ sebastia@ dcoppa@
-rw-r--r--gnu/lib/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 6050bae902c..af5f0798fbd 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,17 +1,16 @@
-# $OpenBSD: Makefile,v 1.21 2017/04/17 15:53:21 kettenis Exp $
+# $OpenBSD: Makefile,v 1.22 2017/08/10 16:06:59 mortimer Exp $
.include <bsd.own.mk>
SUBDIR+=libiberty libreadline
.if make(obj)
-SUBDIR+=libobjc libstdc++ libstdc++-v3 libsupc++-v3 ../usr.bin/cc/libobjc
+SUBDIR+=libstdc++ libstdc++-v3 libsupc++-v3
.else
. if ${BUILD_GCC3:L} == "yes"
-SUBDIR+=libobjc libstdc++
+SUBDIR+=libstdc++
. endif
. if ${BUILD_GCC4:L} == "yes"
-# XXX make sure we build libobjc & libstdc++-v3 from gcc4
-SUBDIR+=../usr.bin/cc/libobjc
+# XXX make sure we build libstdc++-v3 from gcc4
SUBDIR+=libstdc++-v3 libsupc++-v3
. endif
.endif