[src/trunk]: src/sys/conf do dts depend processing in two passes, one for /in...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/068282994d28
branches:  trunk
changeset: 825463:068282994d28
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jul 15 15:53:48 2017 +0000

description:
do dts depend processing in two passes, one for /include/ and one for #include

diffstat:

 sys/conf/dts.mk |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 0b71c3a45283 -r 068282994d28 sys/conf/dts.mk
--- a/sys/conf/dts.mk   Sat Jul 15 15:20:52 2017 +0000
+++ b/sys/conf/dts.mk   Sat Jul 15 15:53:48 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dts.mk,v 1.1 2017/07/15 15:20:52 christos Exp $
+# $NetBSD: dts.mk,v 1.2 2017/07/15 15:53:48 christos Exp $
 
 DTSINC?=$S/external/gpl2/dts/dist/include
 DTSGNUPATH?=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
@@ -8,9 +8,17 @@
 .SUFFIXES: .dtd .dtb .dts
 
 .dts.dtd:
+       (${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
+           -I ${DTSGNUPATH} -include ${.IMPSRC} /dev/null | \
        ${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -i ${DTSGNUPATH} -I dts -O dtb \
-           -p ${DTSPADDING} -b 0 -o /dev/null -d /dev/stdout ${.IMPSRC} | \
-       ${TOOL_SED} -e 's@/dev/null@${.TARGET:.dtd=.dtb}@' > ${.TARGET}
+           -p ${DTSPADDING} -b 0 -o /dev/null -d /dev/stdout | \
+       ${TOOL_SED} -e 's@/dev/null@${.TARGET:.dtd=.dtb}@' \
+           -e 's@<stdin>@${.IMPSRC}@' && \
+       ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
+           -I ${DTSGNUPATH} -include ${.IMPSRC} -M /dev/null | \
+       ${TOOL_SED} -e 's@null.o@${.TARGET:.dtd=.dtb}@' \
+           -e 's@/dev/null@@') > ${.TARGET}
+
 
 .dts.dtb:
        ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \