From owner-svn-src-head@freebsd.org Tue Oct 8 20:26:52 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 91DB913610C; Tue, 8 Oct 2019 20:26:52 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46npmD3KLsz4TK6; Tue, 8 Oct 2019 20:26:52 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 556FF59B1; Tue, 8 Oct 2019 20:26:52 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x98KQqwe047078; Tue, 8 Oct 2019 20:26:52 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x98KQqU6047077; Tue, 8 Oct 2019 20:26:52 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201910082026.x98KQqU6047077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Tue, 8 Oct 2019 20:26:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353324 - head X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 353324 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2019 20:26:52 -0000 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