depend-cleanup.sh: Simplify the logic, and clean bootstrap tools.

* There's no need to check if the file exists before grepping it; if it does not exist, grep will fail, which is what we want.  Just redirect the error message to /dev/null.
* There's no need to split the .o and .pico cases; the bodies are identical, so combine the conditions.  Use a glob to avoid a false negative if one exists but not the other.
* Also run depend-cleanup.sh on the bootstrap build tree.  This unbreaks the build after 29c5f8bf9a.

Sponsored by:	Klara, Inc.
Sponsored by:	NetApp, Inc.
Reviewed by:	imp, emaste
Differential Revision:	https://reviews.freebsd.org/D38447

This commit is contained in:

Dag-Erling Smørgrav

2023-02-08 23:58:51 +01:00

parent 847967bc4e

commit 0dfaefa975

2 changed files with 5 additions and 12 deletions

									
										Makefile.inc1
									
		+3
		
												View File
												
				@@ -1062,6 +1062,9 @@ _bootstrap-tools:

					@echo "--------------------------------------------------------------"

					@echo ">>> stage 1.2: bootstrap tools"

					@echo "--------------------------------------------------------------"

				.if ${MK_CLEAN} != "yes"

					${_+_}cd ${.CURDIR}; ${BMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack

				.endif

					${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools

					mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/casper ${WORLDTMP}/lib/geom \

					    ${WORLDTMP}/bin