svn commit: r262503 - projects/release-debugdist/share/mk

[Glen Barber]

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})