Module Name: src
Committed By: pooka
Date: Thu Mar 25 20:37:36 UTC 2010
Modified Files:
src/share/mk: bsd.ioconf.mk
Log Message:
Depend ioconf.c on config (if doing a USETOOLS==yes build).
While this is not strictly sensible, it keeps UPDATE=1 builds
rolling if I change some aspect of config (such as adding the
cfdriver/cfattach lists now). This is going away eventually.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/mk/bsd.ioconf.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.ioconf.mk
diff -u src/share/mk/bsd.ioconf.mk:1.2 src/share/mk/bsd.ioconf.mk:1.3
--- src/share/mk/bsd.ioconf.mk:1.2 Mon Mar 22 14:42:01 2010
+++ src/share/mk/bsd.ioconf.mk Thu Mar 25 20:37:36 2010
@@ -1,6 +1,8 @@
-# $NetBSD: bsd.ioconf.mk,v 1.2 2010/03/22 14:42:01 pooka Exp $
+# $NetBSD: bsd.ioconf.mk,v 1.3 2010/03/25 20:37:36 pooka Exp $
#
+.include <bsd.own.mk>
+
# If IOCONF is defined, autocreate ioconf.[ch] and locators.h.
# This is useful mainly for devices.
.if !empty(IOCONF)
@@ -9,7 +11,13 @@
# when the kernel build procedures are unified.
.if defined(_BSD_IOCONF_MK_USER_)
-ioconf.c: ${IOCONF}
+# XXX: ioconf.c doesn't need to depend on TOOL_CONFIG, but that helps
+# keep builds working while hashing out some of the experimental
+# features related to ioconf.
+.if ${USETOOLS} == "yes"
+CONFIGDEP=${TOOL_CONFIG}
+.endif
+ioconf.c: ${IOCONF} ${CONFIGDEP}
${TOOL_CONFIG} -b ${.OBJDIR} -s ${S} ${.CURDIR}/${IOCONF}
# config doesn't change the files if they're unchanged. however,
# here we want to satisfy our make dependency, so force a
