Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Depend ioconf.c on config (if doing a USETOOLS==yes...



details:   https://anonhg.NetBSD.org/src/rev/3f471a6492cd
branches:  trunk
changeset: 753393:3f471a6492cd
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Mar 25 20:37:36 2010 +0000

description:
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.

diffstat:

 share/mk/bsd.ioconf.mk |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r f58fceae49f1 -r 3f471a6492cd share/mk/bsd.ioconf.mk
--- a/share/mk/bsd.ioconf.mk    Thu Mar 25 19:54:19 2010 +0000
+++ b/share/mk/bsd.ioconf.mk    Thu Mar 25 20:37:36 2010 +0000
@@ -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



Home | Main Index | Thread Index | Old Index