Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 31 Jan 2020 12:39:52 +0000 (UTC)
From:      Takahashi Yoshihiro <nyan@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r357332 - stable/11/sys/conf
Message-ID:  <202001311239.00VCdqiA003353@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: nyan
Date: Fri Jan 31 12:39:51 2020
New Revision: 357332
URL: https://svnweb.freebsd.org/changeset/base/357332

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/11/sys/conf/kern.post.mk
  stable/11/sys/conf/systags.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/conf/kern.post.mk
==============================================================================
--- stable/11/sys/conf/kern.post.mk	Fri Jan 31 12:38:53 2020	(r357331)
+++ stable/11/sys/conf/kern.post.mk	Fri Jan 31 12:39:51 2020	(r357332)
@@ -312,7 +312,8 @@ kernel-cleandepend: .PHONY
 	rm -f ${DEPENDFILES} ${_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/11/sys/conf/systags.sh
==============================================================================
--- stable/11/sys/conf/systags.sh	Fri Jan 31 12:38:53 2020	(r357331)
+++ stable/11/sys/conf/systags.sh	Fri Jan 31 12:39:51 2020	(r357332)
@@ -37,14 +37,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;
 		}
 	};

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001311239.00VCdqiA003353>