Module Name: src
Committed By: yamt
Date: Sat Nov 19 07:54:25 UTC 2022
Modified Files:
src/sys/conf: assym.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/conf/assym.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/assym.mk
diff -u src/sys/conf/assym.mk:1.7 src/sys/conf/assym.mk:1.8
--- src/sys/conf/assym.mk:1.7 Thu Jul 9 02:13:58 2020
+++ src/sys/conf/assym.mk Sat Nov 19 07:54:25 2022
@@ -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]|.o|}: assym.h
${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
