From owner-svn-src-all@freebsd.org Sat Nov 4 21:05:04 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74332E55BDF; Sat, 4 Nov 2017 21:05:04 +0000 (UTC) (envelope-from bdrewery@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 mx1.freebsd.org (Postfix) with ESMTPS id 416B682475; Sat, 4 Nov 2017 21:05:04 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA4L53OX065069; Sat, 4 Nov 2017 21:05:03 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4L53it065068; Sat, 4 Nov 2017 21:05:03 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711042105.vA4L53it065068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 4 Nov 2017 21:05:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325405 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325405 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Nov 2017 21:05:04 -0000 Author: bdrewery Date: Sat Nov 4 21:05:03 2017 New Revision: 325405 URL: https://svnweb.freebsd.org/changeset/base/325405 Log: Add an assertion to avoid the 'rm -rf /etc' case from cleanobj fixed in r325404. Sponsored by: Dell EMC Isilon Modified: head/share/mk/bsd.obj.mk Modified: head/share/mk/bsd.obj.mk ============================================================================== --- head/share/mk/bsd.obj.mk Sat Nov 4 21:02:26 2017 (r325404) +++ head/share/mk/bsd.obj.mk Sat Nov 4 21:05:03 2017 (r325405) @@ -84,6 +84,10 @@ OBJTOP?= ${MAKEOBJDIR} CANONICALOBJDIR:=/usr/obj${.CURDIR} .endif +.if ${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR} +.error .OBJDIR incorrectly set to /${RELDIR} +.endif + OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP} #