From owner-svn-src-head@FreeBSD.ORG  Tue Oct 21 20:29:43 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9C71021A;
 Tue, 21 Oct 2014 20:29:43 +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 892972E6;
 Tue, 21 Oct 2014 20:29:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9LKThdi074338;
 Tue, 21 Oct 2014 20:29:43 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9LKThT2074337;
 Tue, 21 Oct 2014 20:29:43 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201410212029.s9LKThT2074337@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 21 Oct 2014 20:29:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273417 - head
X-SVN-Group: head
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.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Oct 2014 20:29:43 -0000

Author: imp
Date: Tue Oct 21 20:29:42 2014
New Revision: 273417
URL: https://svnweb.freebsd.org/changeset/base/273417

Log:
  You aren't allowed to test WITH_xxx or WITHOUT_xxx here, so remove it.
  Even if you were allowed to test for it, the test makes no sense as it
  always results in adding -DWITH_ATF unless WITH_ATF was already
  defined. But if MK_ATF != no, then we know it was defined. This, in
  turn, caused tools/build/options/makemake always think WITH_ATF is the
  default, which removed control of that from sys.conf.mk.
  
  To get the intent of the deleted comment, another mechanism is
  required, assuming that the intent of that comment is desirable.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Oct 21 20:21:27 2014	(r273416)
+++ head/Makefile.inc1	Tue Oct 21 20:29:42 2014	(r273417)
@@ -1561,12 +1561,7 @@ gnu/lib/libsupc++__L: gnu/lib/libstdc++_
 
 lib/libgeom__L: lib/libexpat__L
 
-.if defined(WITH_ATF) || ${MK_TESTS} != "no"
-.if !defined(WITH_ATF)
-# Ensure that the ATF libraries will be built during make libraries, even
-# though they will have WITHOUT_TESTS
-MAKE+=		-DWITH_ATF
-.endif
+.if ${MK_TESTS} != "no"
 _lib_atf=	lib/atf
 .endif