Source-Changes-HG archive

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

[src/trunk]: src/sys/conf assym.mk: Fix assym.d generation



details:   https://anonhg.NetBSD.org/src/rev/dc1fd65f0e52
branches:  trunk
changeset: 372368:dc1fd65f0e52
user:      yamt <yamt%NetBSD.org@localhost>
date:      Sat Nov 19 07:54:25 2022 +0000

description:
assym.mk: Fix assym.d generation

It seems that the genassym/mkdep output has been changed.
This commit adapts the assym.d generation rule to the new output.

diffstat:

 sys/conf/assym.mk |  19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r f342fcb013e6 -r dc1fd65f0e52 sys/conf/assym.mk
--- a/sys/conf/assym.mk Fri Nov 18 16:01:00 2022 +0000
+++ b/sys/conf/assym.mk Sat Nov 19 07:54:25 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: assym.mk,v 1.7 2020/07/09 02:13:58 christos Exp $
+# $NetBSD: assym.mk,v 1.8 2022/11/19 07:54:25 yamt Exp $
 
 GENASSYM_FLAGS=${CFLAGS:N-Wa,*:N-fstack-usage*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS} 
 
@@ -16,11 +16,26 @@
 ${SRCS:M*.[sS]:C|\.[Ss]|.d|}: assym.h
 .endif
 
+# assym.dep in the below target looks like:
+#
+#   assym.o: \
+#    /var/folders/74/hw1sphgx0lv63q6pq_n5grw00000gn/T//genassym.BCtq6a/assym.c \
+#    opt_arm_start.h opt_execfmt.h opt_multiprocessor.h \
+#      :
+#      :
+#
+# The following sed modifies it to:
+#
+#   assym.h: \
+#    opt_arm_start.h opt_execfmt.h opt_multiprocessor.h \
+#      :
+#      :
+
 assym.d: assym.h
        ${_MKTARGET_CREATE}
        cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
            ${GENASSYM} -- ${MKDEP} -f assym.dep -- ${GENASSYM_FLAGS}
-       ${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET}
+       ${TOOL_SED} -e '1{N;s/\\\n//;}' -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET}
        rm -f assym.dep
 
 DEPS+= assym.d



Home | Main Index | Thread Index | Old Index