Author: nyan
Date: Fri Jan 31 12:38:53 2020
New Revision: 357331
URL: https://svnweb.freebsd.org/changeset/base/357331
Log:
MFC r357043: Fix kernel-tags target.
> - A depend-file is broken up into .depend.*.o files. [1]
> - Fix an assembly file support.
>
> PR: 241746
> Submitted by: leres [1]
Modified:
stable/12/sys/conf/kern.post.mk
stable/12/sys/conf/systags.sh
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/conf/kern.post.mk
==============================================================================
--- stable/12/sys/conf/kern.post.mk Fri Jan 31 11:33:11 2020
(r357330)
+++ stable/12/sys/conf/kern.post.mk Fri Jan 31 12:38:53 2020
(r357331)
@@ -355,7 +355,8 @@ kernel-cleandepend: .PHONY
rm -f .depend .depend.* ${_ILINKS}
kernel-tags:
- @[ -f .depend ] || { echo "you must make depend first"; exit 1; }
+ @ls .depend.* > /dev/null 2>&1 || \
+ { echo "you must make depend first"; exit 1; }
sh $S/conf/systags.sh
kernel-install: .PHONY
Modified: stable/12/sys/conf/systags.sh
==============================================================================
--- stable/12/sys/conf/systags.sh Fri Jan 31 11:33:11 2020
(r357330)
+++ stable/12/sys/conf/systags.sh Fri Jan 31 12:38:53 2020
(r357331)
@@ -39,14 +39,14 @@
rm -f tags tags.tmp tags.cfiles tags.sfiles tags.hfiles
sed -e "s, machine/, ../../include/,g" \
- -e 's,[a-z][^/ ]*/\.\./,,g' .depend | awk '{
+ -e 's,[a-z][^/ ]*/\.\./,,g' .depend.* | awk '{
for (i = 1; i <= NF; ++i) {
t = substr($i, length($i) - 1)
if (t == ".c")
cfiles[$i] = 1;
else if (t == ".h")
hfiles[$i] = 1;
- else if (t == ".s")
+ else if (t == ".s" || t == ".S")
sfiles[$i] = 1;
}
};
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
