Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Oct 2019 20:26:52 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r353324 - head
Message-ID:  <201910082026.x98KQqU6047077@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Tue Oct  8 20:26:51 2019
New Revision: 353324
URL: https://svnweb.freebsd.org/changeset/base/353324

Log:
  Allow -DNO_CLEAN build across r352689.
  
  Split the LIBCOMPAT case because the usual egrep only matches in
  LIBCOMPAT on amd64.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Oct  8 20:22:05 2019	(r353323)
+++ head/Makefile.inc1	Tue Oct  8 20:26:51 2019	(r353324)
@@ -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



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