From 0ed89481e10dca75e40a2134df088d13361deb5c Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 8 Oct 2019 20:26:51 +0000
Subject: [PATCH] Allow -DNO_CLEAN build across r352689.

Split the LIBCOMPAT case because the usual egrep only matches in
LIBCOMPAT on amd64.
---
 Makefile.inc1 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index a997937da45..ca4ca664994 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -950,6 +950,21 @@ _sanity_check: .PHONY .MAKE
 _cleanobj_fast_depend_hack: .PHONY
 # Syscall stubs rewritten in C and obsolete MD assembly implementations
 # Date      SVN Rev  Syscalls
+# 20190925  r352689  removal of obsolete i386 memchr.S
+.for f in memchr
+	@if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \
+	    egrep -qw 'i386/string/memchr\.S' ${OBJTOP}/lib/libc/.depend.${f}.o; then \
+		echo "Removing stale dependencies for memchr"; \
+		rm -f ${OBJTOP}/lib/libc/.depend.${f}.*; \
+	fi
+.if defined(LIBCOMPAT)
+	@if [ -e "${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.o" ] && \
+	    egrep -qw 'i386/string/memchr\.S' ${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.o; then \
+		echo "Removing stale dependencies for memchr"; \
+		rm -f ${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*; \
+	fi
+.endif
+.endfor
 # 20180604  r334626  brk sbrk
 # 20190916  r352703  shm_open
 .for f in brk sbrk shm_open