From owner-svn-src-all@FreeBSD.ORG  Tue May  6 15:38:45 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7A88A26E;
 Tue,  6 May 2014 15:38:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 677ACF42;
 Tue,  6 May 2014 15:38:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s46Fcj6V076702;
 Tue, 6 May 2014 15:38:45 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s46Fcjbj076701;
 Tue, 6 May 2014 15:38:45 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201405061538.s46Fcjbj076701@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 6 May 2014 15:38:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r265450 - stable/9
X-SVN-Group: stable-9
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.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 May 2014 15:38:45 -0000

Author: brooks
Date: Tue May  6 15:38:44 2014
New Revision: 265450
URL: http://svnweb.freebsd.org/changeset/base/265450

Log:
  MFC: r265097
  
  Merge from CheriBSD:
  
  commit 1d1b908107255ffdff4d17f015d8f057d73cc6cb
  Author: Brooks Davis <brooks@one-eyed-alien.net>
  Date:   Fri Mar 28 16:24:45 2014 +0000
  
      Add a long needed seatbelt.
  
      Exit with an error when make is called without a target at the top level
      rather than poluting the source tree and causing use confusion in future
      builds.
  
  commit a9d9aa341b2f4308a227ab460ba85f1f287ad028
  Author: Brooks Davis <brooks@one-eyed-alien.net>
  Date:   Tue Apr 29 16:06:12 2014 +0000
  
      Simplify seatbelt added in 1d1b908 based in feedback.
  
      Discussed with:     imp@FreeBSD.org
  
  Reviewed by:	imp
  Sponsored by:	DARPA, AFRL

Modified:
  stable/9/Makefile   (contents, props changed)
Directory Properties:
  stable/9/   (props changed)

Modified: stable/9/Makefile
==============================================================================
--- stable/9/Makefile	Tue May  6 14:38:03 2014	(r265449)
+++ stable/9/Makefile	Tue May  6 15:38:44 2014	(r265450)
@@ -222,8 +222,17 @@ cleanworld:
 ${TGTS}:
 	${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET}
 
-# Set a reasonable default
-.MAIN:	all
+# The historic default "all" target creates files which may cause stale
+# or (in the cross build case) unlinkable results. Fail with an error
+# when no target is given. The users can explicitly specify "all"
+# if they want the historic behavior.
+.MAIN:	_guard
+
+_guard:
+	@echo
+	@echo "Explicit target required (use \"all\" for historic behavior)"
+	@echo
+	@false
 
 STARTTIME!= LC_ALL=C date
 CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s ; echo