From owner-svn-src-projects@FreeBSD.ORG  Tue Feb 25 23:43:11 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E0D7A7B7;
 Tue, 25 Feb 2014 23:43:11 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CAB3B1930;
 Tue, 25 Feb 2014 23:43:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PNhBg0080584;
 Tue, 25 Feb 2014 23:43:11 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PNhBgE080583;
 Tue, 25 Feb 2014 23:43:11 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402252343.s1PNhBgE080583@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 25 Feb 2014 23:43:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r262503 - projects/release-debugdist/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Feb 2014 23:43:11 -0000

Author: gjb
Date: Tue Feb 25 23:43:11 2014
New Revision: 262503
URL: http://svnweb.freebsd.org/changeset/base/262503

Log:
  Implement a workaround to allow WITH_DEBUG_FILES and WITHOUT_DEBUG_FILES
  to coexist.
  
  The use case is such that the world/kernel are built with
  WITH_DEBUG_FILES=1, but WITHOUT_DEBUG_FILES=1 is used to populate
  the cdrom/dvdrom directories to create installer images, where we do
  not want debug files.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-debugdist/share/mk/bsd.own.mk

Modified: projects/release-debugdist/share/mk/bsd.own.mk
==============================================================================
--- projects/release-debugdist/share/mk/bsd.own.mk	Tue Feb 25 23:04:39 2014	(r262502)
+++ projects/release-debugdist/share/mk/bsd.own.mk	Tue Feb 25 23:43:11 2014	(r262503)
@@ -461,7 +461,7 @@ MK_${var}:=	yes
 # MK_* options which default to "no".
 #
 .for var in ${__DEFAULT_NO_OPTIONS}
-.if defined(WITH_${var}) && defined(WITHOUT_${var})
+.if defined(WITH_${var}) && defined(WITHOUT_${var}) && ${var} != "DEBUG_FILES"
 .error WITH_${var} and WITHOUT_${var} can't both be set.
 .endif
 .if defined(MK_${var})