Module Name: src
Committed By: skrll
Date: Tue Aug 18 15:11:26 UTC 2009
Modified Files:
src/gnu/lib: Makefile
src/gnu/usr.bin: Makefile
src/gnu/usr.sbin: Makefile
Log Message:
Make binutils stuff conditional on HAVE_BINUTILS being 216.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/gnu/lib/Makefile
cvs rdiff -u -r1.129 -r1.130 src/gnu/usr.bin/Makefile
cvs rdiff -u -r1.16 -r1.17 src/gnu/usr.sbin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/lib/Makefile
diff -u src/gnu/lib/Makefile:1.42 src/gnu/lib/Makefile:1.43
--- src/gnu/lib/Makefile:1.42 Mon Nov 20 17:08:35 2006
+++ src/gnu/lib/Makefile Tue Aug 18 15:11:25 2009
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.42 2006/11/20 17:08:35 skrll Exp $
+# $NetBSD: Makefile,v 1.43 2009/08/18 15:11:25 skrll Exp $
.include <bsd.own.mk>
.if ${MKBFD} != "no"
+.if ${HAVE_BINUTILS} == "216"
SUBDIR+= libopcodes libbfd libiberty
.endif
+.endif
.if ${MKGCC} != "no"
SUBDIR+= crtstuff4 libgcc4 libobjc4 libsupc++4 libstdc++-v3_4
Index: src/gnu/usr.bin/Makefile
diff -u src/gnu/usr.bin/Makefile:1.129 src/gnu/usr.bin/Makefile:1.130
--- src/gnu/usr.bin/Makefile:1.129 Wed Apr 8 16:29:18 2009
+++ src/gnu/usr.bin/Makefile Tue Aug 18 15:11:25 2009
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.129 2009/04/08 16:29:18 christos Exp $
+# $NetBSD: Makefile,v 1.130 2009/08/18 15:11:25 skrll Exp $
# for OBJECT_FMT
.include <bsd.own.mk>
SUBDIR+= bc
-.if ${MKBINUTILS} != "no"
+.if ${MKBINUTILS} != "no" && ${HAVE_BINUTILS} == "216"
SUBDIR+= binutils
.endif
SUBDIR+= c89 c99
Index: src/gnu/usr.sbin/Makefile
diff -u src/gnu/usr.sbin/Makefile:1.16 src/gnu/usr.sbin/Makefile:1.17
--- src/gnu/usr.sbin/Makefile:1.16 Tue Jun 23 17:58:24 2009
+++ src/gnu/usr.sbin/Makefile Tue Aug 18 15:11:25 2009
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2009/06/23 17:58:24 tron Exp $
+# $NetBSD: Makefile,v 1.17 2009/08/18 15:11:25 skrll Exp $
.include <bsd.own.mk>
+.if ${HAVE_BINUTILS} == "216"
SUBDIR= dbsym mdsetimage ncdcs
+.endif
# Speedup stubs for some subtrees that don't need to run these rules
includes-dbsym includes-mdsetimage:
