git: 8d2b36ef6cbd - stable/14 - Fix incremental build with WITH_NVME newly enabled

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Tue, 27 Aug 2024 01:06:56 UTC
The branch stable/14 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=8d2b36ef6cbdc6b147d5fce93b3e2e7336c5becc

commit 8d2b36ef6cbdc6b147d5fce93b3e2e7336c5becc
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-04-18 13:57:38 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-08-26 23:39:15 +0000

    Fix incremental build with WITH_NVME newly enabled
    
    rescue.mk doesn't get updated when options change so nvme_util.o is now
    missing on architectures were NVME was previously marked BROKEN.
    
    Reviewed by:    imp
    Fixes:          2fda3ab0ac19 WITH_NVME: Remove from broken.
    Differential Revision:  https://reviews.freebsd.org/D44826
    
    (cherry picked from commit 26a09db3add30238b99e3214c56a3aee63fd71d1)
---
 tools/build/depend-cleanup.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index 2627b19d4607..a18b9ca75a45 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -159,3 +159,10 @@ if [ -e "$OBJTOP"/tests/sys/fs/fusefs/mockfs.o ] && \
 	echo "Removing stale fusefs GoogleTest objects"
 	run rm -rf "$OBJTOP"/tests/sys/fs/fusefs
 fi
+
+# 20240416  2fda3ab0ac19    WITH_NVME: Remove from broken
+if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \
+    grep -q -v 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then
+	echo "removing rescue.mk without nvme_util.o"; then
+	rm -f "$OBJTOP"/rescue/rescue/rescue.mk
+fi