Date: Tue, 25 Feb 2014 23:43:11 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r262503 - projects/release-debugdist/share/mk Message-ID: <201402252343.s1PNhBgE080583@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402252343.s1PNhBgE080583>